Changeset 1718

Timestamp:

11/18/09 12:53:43 (14 years ago)

Author:

arnonym

Message:

Switching line/inst on channels 1+2 and low/high in channels 3+4 works now with the dbus-interface. Mixer is coming soon.

Gotta ask back whether I am allowed to add the full description of the application-space here for all to see.

Files:

• trunk/libffado/src/dice/focusrite/saffire_pro24.cpp (modified) (1 diff)
• trunk/libffado/src/dice/focusrite/saffire_pro24.h (modified) (2 diffs)

trunk/libffado/src/dice/focusrite/saffire_pro24.cpp

@@ -28 +28 @@
-namespace Focusrite {
-
+const int msgSet = 0x68;
+
-SaffirePro24::SaffirePro24( DeviceManager& d,
-                                        std::auto_ptr<ConfigRom>( configRom ))
-
+
+
+
-{
- 
- getConfigRom().getNodeId() 
+
+getConfigRom().getNodeId()
-}
-
-SaffirePro24::~SaffirePro24()
-{
+    m_eap->deleteElement(m_ch1);
+    m_eap->deleteElement(m_ch2);
+    if (m_ch1) delete m_ch1;
+    if (m_ch2) delete m_ch2;
-}
+bool SaffirePro24::discover() {
+    if (Dice::Device::discover()) {
+        fb_quadlet_t* tmp = (fb_quadlet_t *)calloc(2, sizeof(fb_quadlet_t));
+        m_eap->readRegBlock(Dice::Device::EAP::eRT_Application, 0x58, tmp, 2*sizeof(fb_quadlet_t));
+        hexDumpQuadlets(tmp, 2);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "This is a Dice::Focusrite::SaffirePro24\n");
-    Dice::Device::showDevice();
-}
+bool SaffirePro24::setNickName( std::string name ) {
+    return m_eap->writeRegBlock( Dice::Device::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name.c_str(), name.size() );
+}
+std::string SaffirePro24::getNickName() {
+    char name[16];
+    m_eap->readRegBlock( Dice::Device::EAP::eRT_Application, 0x40, (fb_quadlet_t*)name, 16 );
+    return std::string( name );
+}
+
+
+SaffirePro24::LineInstSwitch::LineInstSwitch(Dice::Device::EAP* eap, std::string name, size_t offset, int activevalue )
+    : Control::Enum(eap, name)
+    , m_eap(eap)
+    , m_selected(0)
+    , m_offset(offset)
+    , m_activevalue(activevalue)
+{
+    m_eap->readReg(Dice::Device::EAP::eRT_Application, m_offset, &m_state_tmp);
+    printf("%s: Active?%i\n", name.c_str(), m_state_tmp&m_activevalue);
+    m_selected = (m_state_tmp&m_activevalue)?1:0;
+}
+int SaffirePro24::LineInstSwitch::selected() {
+    return m_selected;
+}
+bool SaffirePro24::LineInstSwitch::select(int n) {
+    if ( n != m_selected ) {
+        m_selected = n;
+        m_eap->readReg(Dice::Device::EAP::eRT_Application, m_offset, &m_state_tmp);
+        m_eap->writeReg(Dice::Device::EAP::eRT_Application, m_offset, m_state_tmp^m_activevalue);
+        m_eap->writeReg(Dice::Device::EAP::eRT_Application, msgSet, 4);
+    }
+    return true;
+}
+std::string SaffirePro24::LineInstSwitch::getEnumLabel(int n) {
+    if ( n == 1 ) {
+        return "Instrument";
+    }
+    return "Line";
+}
+
+SaffirePro24::LevelSwitch::LevelSwitch(Dice::Device::EAP* eap, std::string name, size_t offset, int activevalue)
+    : LineInstSwitch(eap, name, offset, activevalue)
+{
+}
+std::string SaffirePro24::LevelSwitch::getEnumLabel(int n) {
+    switch (n) {
+        case 0:
+            return "Low";
+        case 1:
+            return "High";
+        default:
+            return "";
+    }
+}
+
-
-}
-}
+
+// vim: et

trunk/libffado/src/dice/focusrite/saffire_pro24.h

@@ -37 +37 @@
-    SaffirePro24( DeviceManager& d,
-                  std::auto_ptr<ConfigRom>( configRom ));
-virtual 
+
-
-virtual void showDevice
+bool discover
-
+    void showDevice();
+
+    bool canChangeNickname() { return true; }
+    bool setNickName( std::string name );
+    std::string getNickName();
+
+    class LineInstSwitch : public Control::Enum
+    {
+    protected:
+        friend class Dice::Focusrite::SaffirePro24;
+
+        LineInstSwitch(Dice::Device::EAP*, std::string name, size_t offset, int activevalue);
+    public:
+        int count() { return 2; }
+
+        int selected();
+        bool select(int);
+
+        std::string getEnumLabel(int);
+
+    private:
+        Dice::Device::EAP* m_eap;
+        int m_selected;
+        size_t m_offset;
+        int m_activevalue;
+        fb_quadlet_t m_state_tmp;
+    };
+    class LevelSwitch : public LineInstSwitch
+    {
+    protected:
+        friend class Dice::Focusrite::SaffirePro24;
+
+        LevelSwitch(Dice::Device::EAP*, std::string name, size_t offset, int activevalue);
+    public:
+        std::string getEnumLabel(int);
+    };
-private:
+    LineInstSwitch *m_ch1, *m_ch2;
+    LevelSwitch *m_ch3, *m_ch4;
-};
-
@@ -48 +86 @@
-
-#endif
+// vim: et