Changeset 1063

Timestamp:

04/28/08 15:26:08 (15 years ago)

Author:

ppalmers

Message:

implement Nickname control element

Files:

• trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (3 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.h (modified) (2 diffs)
• trunk/libffado/src/dice/dice_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/dice/dice_avdevice.h (modified) (2 diffs)
• trunk/libffado/src/ffadodevice.cpp (modified) (3 diffs)
• trunk/libffado/src/ffadodevice.h (modified) (2 diffs)
• trunk/libffado/src/libcontrol/Nickname.cpp (added)
• trunk/libffado/src/libcontrol/Nickname.h (added)
• trunk/libffado/src/SConscript (modified) (1 diff)

trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp

@@ -37 +37 @@
-    , m_MixerContainer( NULL )
-    , m_ControlContainer( NULL )
+    , m_deviceNameControl( NULL )
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Created BeBoB::Focusrite::SaffireProDevice (NodeID %d)\n",
@@ -256 +257 @@
-            "EnableSPDIF1", "Enable S/PDIF 1", "Enable/disable S/PDIF channel"));
-
-result &= m_ControlContainer->addElement(
-new SaffireProDeviceNameControl(*this,
-        "DeviceName", "Flash Device Name", "Device name stored in flash memory")
+m_deviceNameControl = new SaffireProDeviceNameControl(*this,
+    "DeviceName", "Flash Device Name", "Device name stored in flash memory");
+result &= m_ControlContainer->addElement(m_deviceNameControl
-
-    if (!result) {
@@ -314 +315 @@
-
-    return true;
+}
+
+bool
+SaffireProDevice::setNickname( std::string name)
+{
+    if(m_deviceNameControl) {
+        return m_deviceNameControl->setValue(name);
+    } else return false;
+}
+
+std::string
+SaffireProDevice::getNickname()
+{
+    if(m_deviceNameControl) {
+        return m_deviceNameControl->getValue();
+    } else return "Unknown";
-}
-

trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.h

@@ -337 +337 @@
-    virtual bool destroyMixer();
-
+    virtual std::string getNickname();
+    virtual bool setNickname(std::string name);
-protected:
-    void rebootDevice();
@@ -369 +371 @@
-    Control::Container *m_MixerContainer;
-    Control::Container *m_ControlContainer;
+    SaffireProDeviceNameControl *m_deviceNameControl;
-};
-

trunk/libffado/src/dice/dice_avdevice.cpp

@@ -500 +500 @@
-}
-
+bool
+DiceAvDevice::setNickname( std::string name)
+{
+    return setDeviceNickName(name);
+}
+
+std::string
+DiceAvDevice::getNickname()
+{
+    return getDeviceNickName();
+}
+
-void
-DiceAvDevice::showDevice()
@@ -1300 +1312 @@
-}
-
+bool
+DiceAvDevice::setDeviceNickName(std::string name) {
+    char namestring[DICE_NICK_NAME_SIZE+1];
+    strncpy(namestring, name.c_str(), DICE_NICK_NAME_SIZE);
+
+    if (!writeGlobalRegBlock(DICE_REGISTER_GLOBAL_NICK_NAME,
+                        (fb_quadlet_t *)namestring, DICE_NICK_NAME_SIZE)) {
+        debugError("Could not write nickname string \n");
+        return false;
+    }
+    return true;
+}
+
-DiceAvDevice::diceNameVector
-DiceAvDevice::splitNameString(std::string in) {

trunk/libffado/src/dice/dice_avdevice.h

@@ -89 +89 @@
-    virtual bool disableStreaming();
-
+    virtual std::string getNickname();
+    virtual bool setNickname(std::string name);
+
-protected:
-    struct VendorModelEntry *m_model;
@@ -133 +136 @@
-    diceNameVector getClockSourceNameString();
-    std::string getDeviceNickName();
+    bool setDeviceNickName(std::string name);
-
-    enum eClockSourceType  clockIdToType(unsigned int id);

trunk/libffado/src/ffadodevice.cpp

@@ -30 +30 @@
-#include "libcontrol/Element.h"
-#include "libcontrol/ClockSelect.h"
+#include "libcontrol/Nickname.h"
-
-#include <iostream>
@@ -63 +64 @@
-        if(!m_genericContainer->addElement(new Control::ClockSelect(*this))) {
-            debugWarning("failed to add clock source control to container\n");
+        }
+        // add a generic control for the nickname
+        if(!m_genericContainer->addElement(new Control::Nickname(*this))) {
+            debugWarning("failed to add Nickname control to container\n");
-        }
-    }
@@ -152 +157 @@
-    m_DeviceMutex.Unlock();
-    return retval;
+}
+
+bool
+FFADODevice::setNickname( std::string name)
+{
+    return false;
+}
+
+std::string
+FFADODevice::getNickname()
+{
+    return "Unknown";
-}
-

trunk/libffado/src/ffadodevice.h

@@ -419 +419 @@
-
-    /**
+     * @brief return the nick name of this device
+     *
+     * @return string containing the name
+     */
+    virtual std::string getNickname();
+
+    /**
+     * @brief set the nick name of this device
+     * @param name new nickname
+     * @return true if successful
+     */
+    virtual bool setNickname(std::string name);
+
+    /**
-     * @brief handle a bus reset
-     *
@@ -425 +439 @@
-     *
-     */
+    // FIXME: not virtual?
-    void handleBusReset();
-

trunk/libffado/src/SConscript

@@ -87 +87 @@
-        libcontrol/MatrixMixer.cpp \
-        libcontrol/ClockSelect.cpp \
+        libcontrol/Nickname.cpp \
-')
-