Changeset 662

Timestamp:

10/20/07 12:23:54 (15 years ago)

Author:

ppalmers

Message:

- introduce mixer control for the original saffire

Files:

• trunk/libffado/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_generic.cpp (modified) (1 diff)
• trunk/libffado/src/bebob/focusrite/focusrite_generic.h (modified) (3 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_saffire.cpp (modified) (3 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_saffire.h (modified) (2 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.cpp (modified) (4 diffs)
• trunk/libffado/src/bebob/focusrite/focusrite_saffirepro.h (modified) (3 diffs)
• trunk/libffado/support/mixer/mixer.py (modified) (3 diffs)
• trunk/libffado/support/mixer/mixer_saffire.py (added)
• trunk/libffado/support/mixer/mixer_saffire.ui (added)
• trunk/libffado/support/mixer/mixer_saffirepro.py (modified) (1 diff)
• trunk/libffado/support/mixer/SConscript (modified) (1 diff)
• trunk/libffado/tests/test-focusrite.cpp (modified) (1 diff)

trunk/libffado/src/bebob/bebob_avdevice.cpp

@@ -28 +28 @@
-#include "bebob/bebob_mixer.h"
-
+#include "bebob/focusrite/focusrite_saffire.h"
-#include "bebob/focusrite/focusrite_saffirepro.h"
-#include "bebob/terratec/terratec_device.h"
@@ -104 +105 @@
-                case 0x00000006:
-                    return new Focusrite::SaffireProDevice(ieee1394Service, configRom);
+                case 0x00000000:
+                    return new Focusrite::SaffireDevice(ieee1394Service, configRom);
-                default: // return a plain BeBoB device
-                    return new AvDevice(ieee1394Service, configRom);

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

@@ -240 +240 @@
-}
-
+// low resolution volume control
+VolumeControlLowRes::VolumeControlLowRes(FocusriteDevice& parent, int id, int shift)
+: Control::Discrete()
+, m_Parent(parent)
+, m_cmd_id ( id )
+, m_bit_shift( shift )
+{}
+VolumeControlLowRes::VolumeControlLowRes(FocusriteDevice& parent, int id, int shift,
+                std::string name, std::string label, std::string descr)
+: Control::Discrete()
+, m_Parent(parent)
+, m_cmd_id ( id )
+, m_bit_shift( shift )
+{
+    setName(name);
+    setLabel(label);
+    setDescription(descr);
+}
+
+
+bool
+VolumeControlLowRes::setValue(int v)
+{
+    uint32_t reg;
+    uint32_t old_reg;
+    
+    if (v>0xFF) v=0xFF;
+    else if (v<0) v=0;
+
+    if ( !m_Parent.getSpecificValue(m_cmd_id, &reg) ) {
+        debugError( "getSpecificValue failed\n" );
+        return 0;
+    }
+    
+    old_reg=reg;
+    reg &= ~(0xFF<<m_bit_shift);
+    reg |= (v<<m_bit_shift);
+
+    debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d to %d, shift %d (reg: 0x%08X => 0x%08X)\n", 
+                                     m_cmd_id, v, m_bit_shift, old_reg, reg);
+
+    if ( !m_Parent.setSpecificValue(m_cmd_id, reg) ) {
+        debugError( "setSpecificValue failed\n" );
+        return false;
+    } else return true;
+}
+
+int
+VolumeControlLowRes::getValue()
+{
+    uint32_t val, reg;
+
+    if ( !m_Parent.getSpecificValue(m_cmd_id, &reg) ) {
+        debugError( "getSpecificValue failed\n" );
+        return 0;
+    } else {
+        val = (reg & 0xFF)>>m_bit_shift;
+        debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for %d: reg: 0x%08X, result=%d\n", 
+                                         m_cmd_id, reg, val);
+        return val;
+    }
+}
+
+
+// Saffire pro matrix mixer element
+
+FocusriteMatrixMixer::FocusriteMatrixMixer(FocusriteDevice& p)
+: Control::MatrixMixer("MatrixMixer")
+, m_Parent(p)
+{
+}
+
+FocusriteMatrixMixer::FocusriteMatrixMixer(FocusriteDevice& p,std::string n)
+: Control::MatrixMixer(n)
+, m_Parent(p)
+{
+}
+
+void FocusriteMatrixMixer::addSignalInfo(std::vector<struct sSignalInfo> &target,
+    std::string name, std::string label, std::string descr)
+{
+    struct sSignalInfo s;
+    s.name=name;
+    s.label=label;
+    s.description=descr;
+
+    target.push_back(s);
+}
+
+void FocusriteMatrixMixer::setCellInfo(int row, int col, int addr, bool valid)
+{
+    struct sCellInfo c;
+    c.row=row;
+    c.col=col;
+    c.valid=valid;
+    c.address=addr;
+
+    m_CellInfo[row][col]=c;
+}
+
+void FocusriteMatrixMixer::show()
+{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Focusrite Matrix mixer\n");
+}
+
+std::string FocusriteMatrixMixer::getRowName( const int row )
+{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "name for row %d is %s\n", 
+                                     row, m_RowInfo.at(row).name.c_str());
+    return m_RowInfo.at(row).name;
+}
+
+std::string FocusriteMatrixMixer::getColName( const int col )
+{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "name for col %d is %s\n", 
+                                     col, m_ColInfo.at(col).name.c_str());
+    return m_ColInfo.at(col).name;
+}
+
+int FocusriteMatrixMixer::canWrite( const int row, const int col )
+{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "canWrite for row %d col %d is %d\n", 
+                                     row, col, m_CellInfo.at(row).at(col).valid);
+    return m_CellInfo.at(row).at(col).valid;
+}
+
+double FocusriteMatrixMixer::setValue( const int row, const int col, const double val )
+{
+    int32_t v=val;
+    struct sCellInfo c=m_CellInfo.at(row).at(col);
+    
+    debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d row %d col %d to %lf (%ld)\n", 
+                                     c.address, row, col, val, v);
+    
+    if (v>0x07FFF) v=0x07FFF;
+    else if (v<0) v=0;
+
+    if ( !m_Parent.setSpecificValue(c.address, v) ) {
+        debugError( "setSpecificValue failed\n" );
+        return false;
+    } else return true;
+}
+
+double FocusriteMatrixMixer::getValue( const int row, const int col )
+{
+    struct sCellInfo c=m_CellInfo.at(row).at(col);
+    uint32_t val=0;
+
+    if ( !m_Parent.getSpecificValue(c.address, &val) ) {
+        debugError( "getSpecificValue failed\n" );
+        return 0;
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for id %d row %d col %d = %lu\n", 
+                                         c.address, row, col, val);
+        return val;
+    }
+}
+
+int FocusriteMatrixMixer::getRowCount( )
+{
+    return m_RowInfo.size();
+}
+
+int FocusriteMatrixMixer::getColCount( )
+{
+    return m_ColInfo.size();
+}
+
+
-} // Focusrite
-} // BeBoB

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

@@ -30 +30 @@
-
-#include "libcontrol/BasicElements.h"
+#include "libcontrol/MatrixMixer.h"
-
-namespace BeBoB {
@@ -48 +49 @@
-    
-private:
-
+ 
-    unsigned int            m_cmd_id;
-    unsigned int            m_cmd_bit;
@@ -65 +66 @@
-    
-private:
-
+ 
-    unsigned int            m_cmd_id;
-};
-
+class VolumeControlLowRes
+    : public Control::Discrete
+{
+public:
+    VolumeControlLowRes(FocusriteDevice& parent, int id, int shift);
+    VolumeControlLowRes(FocusriteDevice& parent, int id, int shift,
+                  std::string name, std::string label, std::string descr);
+    
+    virtual bool setValue(int v);
+    virtual int getValue();
+    
+private:
+    FocusriteDevice&        m_Parent;
+    unsigned int            m_cmd_id;
+    unsigned int            m_bit_shift;
+};
+
+class FocusriteMatrixMixer : public Control::MatrixMixer
+{
+public:
+    FocusriteMatrixMixer(FocusriteDevice& parent);
+    FocusriteMatrixMixer(FocusriteDevice& parent, std::string n);
+    virtual ~FocusriteMatrixMixer() {};
+
+    virtual void show();
+
+    virtual std::string getRowName( const int );
+    virtual std::string getColName( const int );
+    virtual int canWrite( const int, const int );
+    virtual double setValue( const int, const int, const double );
+    virtual double getValue( const int, const int );
+    virtual int getRowCount( );
+    virtual int getColCount( );
+
+protected:
+    struct sSignalInfo {
+        std::string name;
+        std::string label;
+        std::string description;
+    };
+    struct sCellInfo {
+        int row;
+        int col;
+        // indicates whether a cell can be valid, this
+        // doesn't mean that it is writable. Just that it can be.
+        bool valid;
+        // the address to use when manipulating this cell
+        int address;
+    };
+    
+    virtual void init() = 0;
+    virtual void addSignalInfo(std::vector<struct sSignalInfo> &target,
+                       std::string name, std::string label, std::string descr);
+    virtual void setCellInfo(int row, int col, int addr, bool valid);
+
+    std::vector<struct sSignalInfo> m_RowInfo;
+    std::vector<struct sSignalInfo> m_ColInfo;
+    std::vector< std::vector<struct sCellInfo> > m_CellInfo;
+    
+    FocusriteDevice&        m_Parent;
+};
-
-class FocusriteDevice : public BeBoB::AvDevice {

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

@@ -35 +35 @@
-                 getConfigRom().getNodeId() );
-
+    // the saffire pro doesn't seem to like it if the commands are too fast
+    if (AVC::AVCCommand::getSleepAfterAVCCommand() < 1000) {
+        AVC::AVCCommand::setSleepAfterAVCCommand( 1000 );
+    }
-
-}
@@ -41 +45 @@
-{
-
+}
+bool
+SaffireDevice::buildMixer()
+{
+    bool result=true;
+    debugOutput(DEBUG_LEVEL_VERBOSE, "Building a Focusrite Saffire mixer...\n");
+    
+    destroyMixer();
+    
+    // create the mixer object container
+    m_MixerContainer = new Control::Container("Mixer");
+
+    if (!m_MixerContainer) {
+        debugError("Could not create mixer container...\n");
+        return false;
+    }
+
+    // create control objects for the saffire
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_SPDIF_SWITCH, 0,
+                "SpdifSwitch", "S/PDIF Switch", "S/PDIF Switch"));
+
+    // output mute controls
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT12, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_MUTE,
+                "Out12Mute", "Out1/2 Mute", "Output 1/2 Mute"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT34, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_MUTE,
+                "Out34Mute", "Out3/4 Mute", "Output 3/4 Mute"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT56, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_MUTE,
+                "Out56Mute", "Out5/6 Mute", "Output 5/6 Mute"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT78, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_MUTE,
+                "Out78Mute", "Out7/8 Mute", "Output 7/8 Mute"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT910, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_MUTE,
+                "Out910Mute", "Out9/10 Mute", "Output 9/10 Mute"));
+
+    // output front panel hw volume control
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT12, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_HWCTRL,
+                "Out12HwCtrl", "Out1/2 HwCtrl", "Output 1/2 Front Panel Hardware volume control"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT34, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_HWCTRL,
+                "Out34HwCtrl", "Out3/4 HwCtrl", "Output 3/4 Front Panel Hardware volume control"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT56, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_HWCTRL,
+                "Out56HwCtrl", "Out5/6 HwCtrl", "Output 5/6 Front Panel Hardware volume control"));
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT78, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_HWCTRL,
+                "Out78HwCtrl", "Out7/8 HwCtrl", "Output 7/8 Front Panel Hardware volume control"));
+    
+    // output level dim
+    result &= m_MixerContainer->addElement(
+        new BinaryControl(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT12, FR_SAFFIRE_CMD_ID_BITFIELD_BIT_DIM,
+                "Out12Dim", "Out1/2 Dim", "Output 1/2 Level Dim"));
+
+    // output level controls
+    result &= m_MixerContainer->addElement(
+        new VolumeControlLowRes(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT12, 0,
+                "Out12Level", "Out1/2 Level", "Output 1/2 Level"));
+    result &= m_MixerContainer->addElement(
+        new VolumeControlLowRes(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT34, 0,
+                "Out34Level", "Out3/4 Level", "Output 3/4 Level"));
+    result &= m_MixerContainer->addElement(
+        new VolumeControlLowRes(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT56, 0,
+                "Out56Level", "Out5/6 Level", "Output 5/6 Level"));
+    result &= m_MixerContainer->addElement(
+        new VolumeControlLowRes(*this, 
+                FR_SAFFIRE_CMD_ID_BITFIELD_OUT78, 0,
+                "Out78Level", "Out7/8 Level", "Output 7/8 Level"));
+    
+    // matrix mix controls
+    result &= m_MixerContainer->addElement(
+        new SaffireMatrixMixer(*this, SaffireMatrixMixer::eMMT_InputMix, "InputMix"));
+
+    result &= m_MixerContainer->addElement(
+        new SaffireMatrixMixer(*this, SaffireMatrixMixer::eMMT_PCMix, "PCMix"));
+
+
+    if (!result) {
+        debugWarning("One or more control elements could not be created.");
+        // clean up those that couldn't be created
+        destroyMixer();
+        return false;
+    }
+
+    if (!addElement(m_MixerContainer)) {
+        debugWarning("Could not register mixer to device\n");
+        // clean up
+        destroyMixer();
+        return false;
+    }
+
+    return true;
+}
+
+bool
+SaffireDevice::destroyMixer()
+{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "destroy mixer...\n");
+    
+    if (m_MixerContainer == NULL) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "no mixer to destroy...\n");
+        return true;
+    }
+    
+    if (!deleteElement(m_MixerContainer)) {
+        debugError("Mixer present but not registered to the avdevice\n");
+        return false;
+    }
+    
+    // remove and delete (as in free) child control elements
+    m_MixerContainer->clearElements(true);
+    delete m_MixerContainer;
+    return true;
-}
-
@@ -58 +193 @@
-}
-
+// Saffire pro matrix mixer element
+
+SaffireMatrixMixer::SaffireMatrixMixer(SaffireDevice& p, 
+                                       enum eMatrixMixerType type)
+: FocusriteMatrixMixer(p, "MatrixMixer")
+, m_type(type)
+{
+    init();
+}
+
+SaffireMatrixMixer::SaffireMatrixMixer(SaffireDevice& p, 
+                                       enum eMatrixMixerType type, std::string n)
+: FocusriteMatrixMixer(p, n)
+, m_type(type)
+{
+    init();
+}
+
+void SaffireMatrixMixer::init()
+{
+    if (m_type==eMMT_PCMix) {
+        addSignalInfo(m_RowInfo, "PC12", "PC 1/2", "PC Channel 1/2");
+        addSignalInfo(m_RowInfo, "PC34", "PC 3/4", "PC Channel 3/4");
+        addSignalInfo(m_RowInfo, "PC56", "PC 5/6", "PC Channel 5/6");
+        addSignalInfo(m_RowInfo, "PC78", "PC 7/8", "PC Channel 7/8");
+        addSignalInfo(m_RowInfo, "PC910", "PC 9/10", "PC Channel 9/10");
+        
+        addSignalInfo(m_ColInfo, "OUT12", "OUT 1/2", "Output 1/2");
+        addSignalInfo(m_ColInfo, "OUT34", "OUT 3/4", "Output 3/4");
+        addSignalInfo(m_ColInfo, "OUT56", "OUT 5/6", "Output 5/6");
+        addSignalInfo(m_ColInfo, "OUT78", "OUT 7/8", "Output 7/8");
+        addSignalInfo(m_ColInfo, "OUT910", "OUT 9/10", "Output 9/10");
+        
+        // init the cell matrix
+        #define FOCUSRITE_SAFFIRE_PCMIX_NB_COLS 5
+        #define FOCUSRITE_SAFFIRE_PCMIX_NB_ROWS 5
+        
+        std::vector<struct sCellInfo> tmp_cols( FOCUSRITE_SAFFIRE_PCMIX_NB_COLS );
+        std::vector< std::vector<struct sCellInfo> > tmp_all(FOCUSRITE_SAFFIRE_PCMIX_NB_ROWS, tmp_cols);
+        m_CellInfo = tmp_all;
+    
+        struct sCellInfo c;
+        c.row=-1;
+        c.col=-1;
+        c.valid=false;
+        c.address=0;
+        
+        for (int i=0;i<FOCUSRITE_SAFFIRE_PCMIX_NB_ROWS;i++) {
+            for (int j=0;j<FOCUSRITE_SAFFIRE_PCMIX_NB_COLS;j++) {
+                m_CellInfo[i][j]=c;
+            }
+        }
+    
+        // now set the cells that are valid
+        setCellInfo(0,0,FR_SAFFIRE_CMD_ID_PC12_TO_OUT12, true);
+        setCellInfo(0,1,FR_SAFFIRE_CMD_ID_PC12_TO_OUT34, true);
+        setCellInfo(0,2,FR_SAFFIRE_CMD_ID_PC12_TO_OUT56, true);
+        setCellInfo(0,3,FR_SAFFIRE_CMD_ID_PC12_TO_OUT79, true);
+        setCellInfo(0,4,FR_SAFFIRE_CMD_ID_PC12_TO_OUT910, true);
+        setCellInfo(1,0,FR_SAFFIRE_CMD_ID_PC34_TO_OUT12, true);
+        setCellInfo(1,1,FR_SAFFIRE_CMD_ID_PC34_TO_OUT34, true);
+        setCellInfo(1,2,FR_SAFFIRE_CMD_ID_PC34_TO_OUT56, true);
+        setCellInfo(1,3,FR_SAFFIRE_CMD_ID_PC34_TO_OUT79, true);
+        setCellInfo(1,4,FR_SAFFIRE_CMD_ID_PC34_TO_OUT910, true);
+        setCellInfo(2,0,FR_SAFFIRE_CMD_ID_PC56_TO_OUT12, true);
+        setCellInfo(2,1,FR_SAFFIRE_CMD_ID_PC56_TO_OUT34, true);
+        setCellInfo(2,2,FR_SAFFIRE_CMD_ID_PC56_TO_OUT56, true);
+        setCellInfo(2,3,FR_SAFFIRE_CMD_ID_PC56_TO_OUT79, true);
+        setCellInfo(2,4,FR_SAFFIRE_CMD_ID_PC56_TO_OUT910, true);
+        setCellInfo(3,0,FR_SAFFIRE_CMD_ID_PC78_TO_OUT12, true);
+        setCellInfo(3,1,FR_SAFFIRE_CMD_ID_PC78_TO_OUT34, true);
+        setCellInfo(3,2,FR_SAFFIRE_CMD_ID_PC78_TO_OUT56, true);
+        setCellInfo(3,3,FR_SAFFIRE_CMD_ID_PC78_TO_OUT79, true);
+        setCellInfo(3,4,FR_SAFFIRE_CMD_ID_PC78_TO_OUT910, true);
+        setCellInfo(4,0,FR_SAFFIRE_CMD_ID_PC910_TO_OUT12, true);
+        setCellInfo(4,1,FR_SAFFIRE_CMD_ID_PC910_TO_OUT34, true);
+        setCellInfo(4,2,FR_SAFFIRE_CMD_ID_PC910_TO_OUT56, true);
+        setCellInfo(4,3,FR_SAFFIRE_CMD_ID_PC910_TO_OUT79, true);
+        setCellInfo(4,4,FR_SAFFIRE_CMD_ID_PC910_TO_OUT910, true);
+
+    } else if (m_type==eMMT_InputMix) {
+        addSignalInfo(m_RowInfo, "IN1", "Input 1", "Analog Input 1");
+        addSignalInfo(m_RowInfo, "IN2", "Input 2", "Analog Input 2");
+        addSignalInfo(m_RowInfo, "SPDIFL", "SPDIF L", "S/PDIF Left Input");
+        addSignalInfo(m_RowInfo, "SPDIFR", "SPDIF R", "S/PDIF Right Input");
+        addSignalInfo(m_RowInfo, "REV1", "REVERB 1", "Reverb CH1 return");
+        addSignalInfo(m_RowInfo, "REV1", "REVERB 2", "Reverb CH2 return");
+        
+        addSignalInfo(m_ColInfo, "OUT1", "OUT 1", "Output 1");
+        addSignalInfo(m_ColInfo, "OUT2", "OUT 2", "Output 2");
+        addSignalInfo(m_ColInfo, "OUT3", "OUT 3", "Output 3");
+        addSignalInfo(m_ColInfo, "OUT4", "OUT 4", "Output 4");
+        addSignalInfo(m_ColInfo, "OUT5", "OUT 5", "Output 5");
+        addSignalInfo(m_ColInfo, "OUT6", "OUT 6", "Output 6");
+        addSignalInfo(m_ColInfo, "OUT7", "OUT 7", "Output 7");
+        addSignalInfo(m_ColInfo, "OUT8", "OUT 8", "Output 8");
+        addSignalInfo(m_ColInfo, "OUT9", "OUT 9", "Output 9");
+        addSignalInfo(m_ColInfo, "OUT10", "OUT 10", "Output 10");
+        
+        // init the cell matrix
+        #define FOCUSRITE_SAFFIRE_INPUTMIX_NB_COLS 10
+        #define FOCUSRITE_SAFFIRE_INPUTMIX_NB_ROWS 6
+        
+        std::vector<struct sCellInfo> tmp_cols( FOCUSRITE_SAFFIRE_INPUTMIX_NB_COLS );
+        std::vector< std::vector<struct sCellInfo> > tmp_all(FOCUSRITE_SAFFIRE_INPUTMIX_NB_ROWS,tmp_cols);
+        m_CellInfo = tmp_all;
+    
+        struct sCellInfo c;
+        c.row=-1;
+        c.col=-1;
+        c.valid=false;
+        c.address=0;
+        
+        for (int i=0;i<FOCUSRITE_SAFFIRE_INPUTMIX_NB_ROWS;i++) {
+            for (int j=0;j<FOCUSRITE_SAFFIRE_INPUTMIX_NB_COLS;j++) {
+                m_CellInfo[i][j]=c;
+            }
+        }
+
+        // now set the cells that are valid
+        setCellInfo(0,0,FR_SAFFIRE_CMD_ID_IN1_TO_OUT1, true);
+        setCellInfo(0,2,FR_SAFFIRE_CMD_ID_IN1_TO_OUT3, true);
+        setCellInfo(0,4,FR_SAFFIRE_CMD_ID_IN1_TO_OUT5, true);
+        setCellInfo(0,6,FR_SAFFIRE_CMD_ID_IN1_TO_OUT7, true);
+        setCellInfo(0,8,FR_SAFFIRE_CMD_ID_IN1_TO_OUT9, true);
+        setCellInfo(1,1,FR_SAFFIRE_CMD_ID_IN2_TO_OUT2, true);
+        setCellInfo(1,3,FR_SAFFIRE_CMD_ID_IN2_TO_OUT4, true);
+        setCellInfo(1,5,FR_SAFFIRE_CMD_ID_IN2_TO_OUT6, true);
+        setCellInfo(1,7,FR_SAFFIRE_CMD_ID_IN2_TO_OUT8, true);
+        setCellInfo(1,9,FR_SAFFIRE_CMD_ID_IN2_TO_OUT10, true);
+        setCellInfo(2,0,FR_SAFFIRE_CMD_ID_IN3_TO_OUT1, true);
+        setCellInfo(2,2,FR_SAFFIRE_CMD_ID_IN3_TO_OUT3, true);
+        setCellInfo(2,4,FR_SAFFIRE_CMD_ID_IN3_TO_OUT5, true);
+        setCellInfo(2,6,FR_SAFFIRE_CMD_ID_IN3_TO_OUT7, true);
+        setCellInfo(2,8,FR_SAFFIRE_CMD_ID_IN3_TO_OUT9, true);
+        setCellInfo(3,1,FR_SAFFIRE_CMD_ID_IN4_TO_OUT2, true);
+        setCellInfo(3,3,FR_SAFFIRE_CMD_ID_IN4_TO_OUT4, true);
+        setCellInfo(3,5,FR_SAFFIRE_CMD_ID_IN4_TO_OUT6, true);
+        setCellInfo(3,7,FR_SAFFIRE_CMD_ID_IN4_TO_OUT8, true);
+        setCellInfo(3,9,FR_SAFFIRE_CMD_ID_IN4_TO_OUT10, true);
+
+        setCellInfo(4,0,FR_SAFFIRE_CMD_ID_REV1_TO_OUT1, true);
+        setCellInfo(5,1,FR_SAFFIRE_CMD_ID_REV2_TO_OUT2, true);
+        setCellInfo(4,2,FR_SAFFIRE_CMD_ID_REV1_TO_OUT3, true);
+        setCellInfo(5,3,FR_SAFFIRE_CMD_ID_REV2_TO_OUT4, true);
+        setCellInfo(4,4,FR_SAFFIRE_CMD_ID_REV1_TO_OUT5, true);
+        setCellInfo(5,5,FR_SAFFIRE_CMD_ID_REV2_TO_OUT6, true);
+        setCellInfo(4,6,FR_SAFFIRE_CMD_ID_REV1_TO_OUT7, true);
+        setCellInfo(5,7,FR_SAFFIRE_CMD_ID_REV2_TO_OUT8, true);
+        setCellInfo(4,8,FR_SAFFIRE_CMD_ID_REV1_TO_OUT9, true);
+        setCellInfo(5,9,FR_SAFFIRE_CMD_ID_REV2_TO_OUT10, true);
+
+    } else {
+        debugError("Invalid mixer type\n");
+    }
+}
+
+void SaffireMatrixMixer::show()
+{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Saffire Pro Matrix mixer type %d\n");
+}
+
-} // Focusrite
-} // BeBoB

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

@@ -29 +29 @@
-#include "focusrite_generic.h"
-
+#include "libcontrol/BasicElements.h"
+#include "libcontrol/MatrixMixer.h"
+
+// The ID's for the hardware input matrix mixer
+#define FR_SAFFIRE_CMD_ID_IN1_TO_OUT1       1
+#define FR_SAFFIRE_CMD_ID_IN1_TO_OUT3       2
+#define FR_SAFFIRE_CMD_ID_IN1_TO_OUT5       3
+#define FR_SAFFIRE_CMD_ID_IN1_TO_OUT7       4
+#define FR_SAFFIRE_CMD_ID_IN1_TO_OUT9       0
+#define FR_SAFFIRE_CMD_ID_IN2_TO_OUT2       16
+#define FR_SAFFIRE_CMD_ID_IN2_TO_OUT4       17
+#define FR_SAFFIRE_CMD_ID_IN2_TO_OUT6       18
+#define FR_SAFFIRE_CMD_ID_IN2_TO_OUT8       19
+#define FR_SAFFIRE_CMD_ID_IN2_TO_OUT10      15
+#define FR_SAFFIRE_CMD_ID_IN3_TO_OUT1       6
+#define FR_SAFFIRE_CMD_ID_IN3_TO_OUT3       7
+#define FR_SAFFIRE_CMD_ID_IN3_TO_OUT5       8
+#define FR_SAFFIRE_CMD_ID_IN3_TO_OUT7       9
+#define FR_SAFFIRE_CMD_ID_IN3_TO_OUT9       5
+#define FR_SAFFIRE_CMD_ID_IN4_TO_OUT2       21
+#define FR_SAFFIRE_CMD_ID_IN4_TO_OUT4       22
+#define FR_SAFFIRE_CMD_ID_IN4_TO_OUT6       23
+#define FR_SAFFIRE_CMD_ID_IN4_TO_OUT8       24
+#define FR_SAFFIRE_CMD_ID_IN4_TO_OUT10      20
+
+// reverb return id's (part of hardware input mixer)
+#define FR_SAFFIRE_CMD_ID_REV1_TO_OUT1       11
+#define FR_SAFFIRE_CMD_ID_REV2_TO_OUT2       26
+#define FR_SAFFIRE_CMD_ID_REV1_TO_OUT3       12
+#define FR_SAFFIRE_CMD_ID_REV2_TO_OUT4       27
+#define FR_SAFFIRE_CMD_ID_REV1_TO_OUT5       13
+#define FR_SAFFIRE_CMD_ID_REV2_TO_OUT6       28
+#define FR_SAFFIRE_CMD_ID_REV1_TO_OUT7       14
+#define FR_SAFFIRE_CMD_ID_REV2_TO_OUT8       29
+#define FR_SAFFIRE_CMD_ID_REV1_TO_OUT9       10
+#define FR_SAFFIRE_CMD_ID_REV2_TO_OUT10      25
+
+// The ID's for the playback matrix mixer
+#define FR_SAFFIRE_CMD_ID_PC12_TO_OUT12     36
+#define FR_SAFFIRE_CMD_ID_PC12_TO_OUT34     37
+#define FR_SAFFIRE_CMD_ID_PC12_TO_OUT56     38
+#define FR_SAFFIRE_CMD_ID_PC12_TO_OUT79     39
+#define FR_SAFFIRE_CMD_ID_PC12_TO_OUT910    35
+#define FR_SAFFIRE_CMD_ID_PC34_TO_OUT12     41
+#define FR_SAFFIRE_CMD_ID_PC34_TO_OUT34     42
+#define FR_SAFFIRE_CMD_ID_PC34_TO_OUT56     43
+#define FR_SAFFIRE_CMD_ID_PC34_TO_OUT79     44
+#define FR_SAFFIRE_CMD_ID_PC34_TO_OUT910    40
+#define FR_SAFFIRE_CMD_ID_PC56_TO_OUT12     46
+#define FR_SAFFIRE_CMD_ID_PC56_TO_OUT34     47
+#define FR_SAFFIRE_CMD_ID_PC56_TO_OUT56     48
+#define FR_SAFFIRE_CMD_ID_PC56_TO_OUT79     49
+#define FR_SAFFIRE_CMD_ID_PC56_TO_OUT910    45
+#define FR_SAFFIRE_CMD_ID_PC78_TO_OUT12     51
+#define FR_SAFFIRE_CMD_ID_PC78_TO_OUT34     52
+#define FR_SAFFIRE_CMD_ID_PC78_TO_OUT56     53
+#define FR_SAFFIRE_CMD_ID_PC78_TO_OUT79     54
+#define FR_SAFFIRE_CMD_ID_PC78_TO_OUT910    50
+#define FR_SAFFIRE_CMD_ID_PC910_TO_OUT12    31
+#define FR_SAFFIRE_CMD_ID_PC910_TO_OUT34    32
+#define FR_SAFFIRE_CMD_ID_PC910_TO_OUT56    33
+#define FR_SAFFIRE_CMD_ID_PC910_TO_OUT79    34
+#define FR_SAFFIRE_CMD_ID_PC910_TO_OUT910   30
+
+// the control ID's
+#define FR_SAFFIRE_CMD_ID_BITFIELD_OUT12      55
+#define FR_SAFFIRE_CMD_ID_BITFIELD_OUT34      56
+#define FR_SAFFIRE_CMD_ID_BITFIELD_OUT56      57
+#define FR_SAFFIRE_CMD_ID_BITFIELD_OUT78      58
+#define FR_SAFFIRE_CMD_ID_BITFIELD_OUT910     59
+
+#define FR_SAFFIRE_CMD_ID_BITFIELD_BIT_DIM       24
+#define FR_SAFFIRE_CMD_ID_BITFIELD_BIT_MUTE      25
+#define FR_SAFFIRE_CMD_ID_BITFIELD_BIT_HWCTRL    26
+
+// other stuff
+#define FR_SAFFIRE_CMD_ID_MONITOR_DIAL    61
+#define FR_SAFFIRE_CMD_ID_SPDIF_SWITCH    62
+
+#define FR_SAFFIRE_CMD_ID_METERING_IN1      64
+#define FR_SAFFIRE_CMD_ID_METERING_IN2      65
+#define FR_SAFFIRE_CMD_ID_METERING_IN3      66
+#define FR_SAFFIRE_CMD_ID_METERING_IN4      67
+
+#define FR_SAFFIRE_CMD_ID_SPDIF_DETECT    79
+
-namespace BeBoB {
-namespace Focusrite {
+
+class SaffireDevice;
+
+class SaffireMatrixMixer : public FocusriteMatrixMixer
+{
+public:
+    enum eMatrixMixerType {
+        eMMT_InputMix,
+        eMMT_PCMix
+    };
+    
+public:
+    SaffireMatrixMixer(SaffireDevice& parent, enum eMatrixMixerType type);
+    SaffireMatrixMixer(SaffireDevice& parent, enum eMatrixMixerType type, std::string n);
+    virtual ~SaffireMatrixMixer() {};
+
+    virtual void show();
+
+protected:
+    void init();
+    enum eMatrixMixerType m_type;
+};
-
-class SaffireDevice : public FocusriteDevice {
@@ -41 +149 @@
-    virtual void setVerboseLevel(int l);
-
+    virtual bool buildMixer();
+    virtual bool destroyMixer();
+
+private:
+    Control::Container *m_MixerContainer;
-};
-

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

@@ -145 +145 @@
-    result &= m_MixerContainer->addElement(
-        new BinaryControl(*this, 
-PAD
+DIM
-                "Out12Dim", "Out1/2 Dim", "Output 1/2 Level Dim"));
-    result &= m_MixerContainer->addElement(
-        new BinaryControl(*this, 
-PAD
+DIM
-                "Out34Dim", "Out3/4 Dim", "Output 3/4 Level Dim"));
-    result &= m_MixerContainer->addElement(
-        new BinaryControl(*this, 
-PAD
+DIM
-                "Out56Dim", "Out5/6 Dim", "Output 5/6 Level Dim"));
-    result &= m_MixerContainer->addElement(
-        new BinaryControl(*this, 
-PAD
+DIM
-                "Out78Dim", "Out7/8 Dim", "Output 7/8 Level Dim"));
-
@@ -357 +357 @@
-SaffireProMatrixMixer::SaffireProMatrixMixer(SaffireProDevice& p, 
-                                             enum eMatrixMixerType type)
-
-
+
-, m_type(type)
-{
-type
+
-}
-
-SaffireProMatrixMixer::SaffireProMatrixMixer(SaffireProDevice& p, 
-                                             enum eMatrixMixerType type, std::string n)
-
-
+
-, m_type(type)
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        addSignalInfo(m_RowInfo, "PC1", "PC 1", "PC Channel 1");
-        addSignalInfo(m_RowInfo, "PC2", "PC 2", "PC Channel 2");
@@ -472 +448 @@
-        setCellInfo(11,9,FR_SAFFIREPRO_CMD_ID_MIX2_TO_OUT10, true);
-
-
+m_
-        addSignalInfo(m_RowInfo, "AN1", "Analog 1", "Analog Input 1");
-        addSignalInfo(m_RowInfo, "AN2", "Analog 2", "Analog Input 2");
@@ -591 +567 @@
-}
-
-std::string SaffireProMatrixMixer::getRowName( const int row )
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "name for row %d is %s\n", 
-                                     row, m_RowInfo.at(row).name.c_str());
-    return m_RowInfo.at(row).name;
-}
-
-std::string SaffireProMatrixMixer::getColName( const int col )
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "name for col %d is %s\n", 
-                                     col, m_ColInfo.at(col).name.c_str());
-    return m_ColInfo.at(col).name;
-}
-
-int SaffireProMatrixMixer::canWrite( const int row, const int col )
-{
-    debugOutput(DEBUG_LEVEL_VERBOSE, "canWrite for row %d col %d is %d\n", 
-                                     row, col, m_CellInfo.at(row).at(col).valid);
-    return m_CellInfo.at(row).at(col).valid;
-}
-
-double SaffireProMatrixMixer::setValue( const int row, const int col, const double val )
-{
-    int32_t v=val;
-    struct sCellInfo c=m_CellInfo.at(row).at(col);
-    
-    debugOutput(DEBUG_LEVEL_VERBOSE, "setValue for id %d row %d col %d to %lf (%ld)\n", 
-                                     c.address, row, col, val, v);
-    
-    if (v>0x07FFF) v=0x07FFF;
-    else if (v<0) v=0;
-
-    if ( !m_Parent.setSpecificValue(c.address, v) ) {
-        debugError( "setSpecificValue failed\n" );
-        return false;
-    } else return true;
-}
-
-double SaffireProMatrixMixer::getValue( const int row, const int col )
-{
-    struct sCellInfo c=m_CellInfo.at(row).at(col);
-    uint32_t val=0;
-
-    if ( !m_Parent.getSpecificValue(c.address, &val) ) {
-        debugError( "getSpecificValue failed\n" );
-        return 0;
-    } else {
-        debugOutput(DEBUG_LEVEL_VERBOSE, "getValue for id %d row %d col %d = %lf\n", 
-                                         c.address, row, col, val);
-        return val;
-    }
-}
-
-int SaffireProMatrixMixer::getRowCount( )
-{
-    return m_RowInfo.size();
-}
-
-int SaffireProMatrixMixer::getColCount( )
-{
-    return m_ColInfo.size();
-}
-
-} // Focusrite
-} // BeBoB

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

@@ -30 +30 @@
-
-#include "libcontrol/BasicElements.h"
-#include "libcontrol/MatrixMixer.h"
-
-#include <vector>
@@ -161 +160 @@
-class SaffireProDevice;
-
-Control::
+Focusrite
-{
-public:
@@ -176 +175 @@
-    virtual void show();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-};
-

trunk/libffado/support/mixer/mixer.py

@@ -6 +6 @@
-from mixer_phase24 import *
-from mixer_saffirepro import *
+from mixer_saffire import *
-import sys
-import dbus
@@ -15 +16 @@
-    [(0x00130e, 0x00000003),'SaffireProMixer'],
-    [(0x00130e, 0x00000006),'SaffireProMixer'],
+    [(0x00130e, 0x00000000),'SaffireMixer'],
-    ]
-
@@ -123 +125 @@
-                app.setMainWidget(forms[idx])
-
-
+
+
-
-
+
+
+

trunk/libffado/support/mixer/mixer_saffirepro.py

@@ -354 +354 @@
-                'ac3pass':    ['/Mixer/AC3pass', self.chkAC3], 
-                'midithru':   ['/Mixer/MidiTru', self.chkMidiThru], 
+                # The following controls are available but have no GUI elements yet
+                #'out12mute':      ['/Mixer/Out12Mute', self.chkOut12Mute],
+                #'out12hwctrl':    ['/Mixer/Out12HwCtrl', self.chkOut12HwCtrl],
+                #'out12pad':       ['/Mixer/Out12Pad', self.chkOut12Pad],
+                #'out12dim':       ['/Mixer/Out12Dim', self.chkOut12Dim],
+                #'out34mute':      ['/Mixer/Out34Mute', self.chkOut34Mute],
+                #'out34hwctrl':    ['/Mixer/Out34HwCtrl', self.chkOut34HwCtrl],
+                #'out34pad':       ['/Mixer/Out34Pad', self.chkOut34Pad],
+                #'out34dim':       ['/Mixer/Out34Dim', self.chkOut34Dim],
+                #'out56mute':      ['/Mixer/Out56Mute', self.chkOut56Mute],
+                #'out56hwctrl':    ['/Mixer/Out56HwCtrl', self.chkOut56HwCtrl],
+                #'out56pad':       ['/Mixer/Out56Pad', self.chkOut56Pad],
+                #'out56dim':       ['/Mixer/Out56Dim', self.chkOut56Dim],
+                #'out78mute':      ['/Mixer/Out78Mute', self.chkOut78Mute],
+                #'out78hwctrl':    ['/Mixer/Out78HwCtrl', self.chkOut78HwCtrl],
+                #'out78pad':       ['/Mixer/Out78Pad', self.chkOut78Pad],
+                #'out78dim':       ['/Mixer/Out78Dim', self.chkOut78Dim],
+                #'out910mute':      ['/Mixer/Out910Mute', self.chkOut910Mute],
+                #'out910hwctrl':    ['/Mixer/Out910HwCtrl', self.chkOut910HwCtrl],
+                #'out910pad':       ['/Mixer/Out910Pad', self.chkOut910Pad],
+                #'out910dim':       ['/Mixer/Out910Dim', self.chkOut910Dim],
-            }
-

trunk/libffado/support/mixer/SConscript

@@ -4 +4 @@
-
-if env.has_key('PYUIC'):
-
+,"mixer_saffire.ui"
-                env.Command( target=app.replace(".","")+".py", source=app, action="$PYUIC $SOURCE > $TARGET" )

trunk/libffado/tests/test-focusrite.cpp

@@ -166 +166 @@
-        cmd.setVerbose( DEBUG_LEVEL_NORMAL );
-    
-
+
+
-    
-    while(1) {
-
+
+
+
+
+
-            cmd.setCommandType( AVC::AVCCommand::eCT_Status );
-            cmd.setNodeId( arguments.node  );