Changeset 650

Timestamp:

10/14/07 14:40:59 (15 years ago)

Author:

ppalmers

Message:

Implement the focusrite saffire pro internal mixers as two connected matrix mixers.
One for the input mix and one for the output mix.

Note: does not check for out-of-boundary yet

Files:

• trunk/libffado/src/bebob/focusrite/focusrite_cmd.h (modified) (1 diff)
• 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/bebob/focusrite/focusrite_cmd.h

@@ -47 +47 @@
-#define FOCUSRITE_CMD_SAMPLERATE_176K4  5
-#define FOCUSRITE_CMD_SAMPLERATE_192K   6
+
+#define FOCUSRITE_CMD_ID_AN1_TO_IMIXL        0
+#define FOCUSRITE_CMD_ID_AN1_TO_IMIXR        1
+#define FOCUSRITE_CMD_ID_AN2_TO_IMIXL        2
+#define FOCUSRITE_CMD_ID_AN2_TO_IMIXR        3
+#define FOCUSRITE_CMD_ID_AN3_TO_IMIXL        4
+#define FOCUSRITE_CMD_ID_AN3_TO_IMIXR        5
+#define FOCUSRITE_CMD_ID_AN4_TO_IMIXL        6
+#define FOCUSRITE_CMD_ID_AN4_TO_IMIXR        7
+#define FOCUSRITE_CMD_ID_AN5_TO_IMIXL        8
+#define FOCUSRITE_CMD_ID_AN5_TO_IMIXR        9
+#define FOCUSRITE_CMD_ID_AN6_TO_IMIXL       10
+#define FOCUSRITE_CMD_ID_AN6_TO_IMIXR       11
+#define FOCUSRITE_CMD_ID_AN7_TO_IMIXL       12
+#define FOCUSRITE_CMD_ID_AN7_TO_IMIXR       13
+#define FOCUSRITE_CMD_ID_AN8_TO_IMIXL       14
+#define FOCUSRITE_CMD_ID_AN8_TO_IMIXR       15
+#define FOCUSRITE_CMD_ID_SPDIFL_TO_IMIXL    16
+#define FOCUSRITE_CMD_ID_SPDIFL_TO_IMIXR    17
+#define FOCUSRITE_CMD_ID_SPDIFR_TO_IMIXL    18
+#define FOCUSRITE_CMD_ID_SPDIFR_TO_IMIXR    19
+
+#define FOCUSRITE_CMD_ID_ADAT11_TO_IMIXL    20
+#define FOCUSRITE_CMD_ID_ADAT11_TO_IMIXR    21
+#define FOCUSRITE_CMD_ID_ADAT12_TO_IMIXL    22
+#define FOCUSRITE_CMD_ID_ADAT12_TO_IMIXR    23
+#define FOCUSRITE_CMD_ID_ADAT13_TO_IMIXL    24
+#define FOCUSRITE_CMD_ID_ADAT13_TO_IMIXR    25
+#define FOCUSRITE_CMD_ID_ADAT14_TO_IMIXL    26
+#define FOCUSRITE_CMD_ID_ADAT14_TO_IMIXR    27
+#define FOCUSRITE_CMD_ID_ADAT15_TO_IMIXL    28
+#define FOCUSRITE_CMD_ID_ADAT15_TO_IMIXR    29
+#define FOCUSRITE_CMD_ID_ADAT16_TO_IMIXL    30
+#define FOCUSRITE_CMD_ID_ADAT16_TO_IMIXR    31
+#define FOCUSRITE_CMD_ID_ADAT17_TO_IMIXL    32
+#define FOCUSRITE_CMD_ID_ADAT17_TO_IMIXR    33
+#define FOCUSRITE_CMD_ID_ADAT18_TO_IMIXL    34
+#define FOCUSRITE_CMD_ID_ADAT18_TO_IMIXR    35
+
+#define FOCUSRITE_CMD_ID_ADAT21_TO_IMIXL    36
+#define FOCUSRITE_CMD_ID_ADAT21_TO_IMIXR    37
+#define FOCUSRITE_CMD_ID_ADAT22_TO_IMIXL    38
+#define FOCUSRITE_CMD_ID_ADAT22_TO_IMIXR    39
+#define FOCUSRITE_CMD_ID_ADAT23_TO_IMIXL    40
+#define FOCUSRITE_CMD_ID_ADAT23_TO_IMIXR    41
+#define FOCUSRITE_CMD_ID_ADAT24_TO_IMIXL    42
+#define FOCUSRITE_CMD_ID_ADAT24_TO_IMIXR    43
+#define FOCUSRITE_CMD_ID_ADAT25_TO_IMIXL    44
+#define FOCUSRITE_CMD_ID_ADAT25_TO_IMIXR    45
+#define FOCUSRITE_CMD_ID_ADAT26_TO_IMIXL    46
+#define FOCUSRITE_CMD_ID_ADAT26_TO_IMIXR    47
+#define FOCUSRITE_CMD_ID_ADAT27_TO_IMIXL    48
+#define FOCUSRITE_CMD_ID_ADAT27_TO_IMIXR    49
+#define FOCUSRITE_CMD_ID_ADAT28_TO_IMIXL    50
+#define FOCUSRITE_CMD_ID_ADAT28_TO_IMIXR    51
-
-#define FOCUSRITE_CMD_ID_PC1_TO_OUT1    52

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

@@ -65 +65 @@
-    if (m_MidiTru) addElement(m_MidiTru);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -183 +94 @@
-    if (m_MidiTru) delete m_MidiTru;
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-}
-
@@ -326 +221 @@
-}
-
+
+// Saffire pro matrix mixer element
+
+SaffireProMatrixMixer::SaffireProMatrixMixer(SaffireProDevice& p, 
+                                             enum eMatrixMixerType type)
+: Control::MatrixMixer("MatrixMixer")
+, m_Parent(p)
+, m_type(type)
+{
+    init(type);
+}
+
+SaffireProMatrixMixer::SaffireProMatrixMixer(SaffireProDevice& p, 
+                                             enum eMatrixMixerType type, std::string n)
+: Control::MatrixMixer(n)
+, m_Parent(p)
+, m_type(type)
+{
+    init(type);
+}
+
+void SaffireProMatrixMixer::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 SaffireProMatrixMixer::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 SaffireProMatrixMixer::init(enum eMatrixMixerType type)
+{
+    if (type==eMMT_OutputMix) {
+        addSignalInfo(m_RowInfo, "PC1", "PC 1", "PC Channel 1");
+        addSignalInfo(m_RowInfo, "PC2", "PC 2", "PC Channel 2");
+        addSignalInfo(m_RowInfo, "PC3", "PC 3", "PC Channel 3");
+        addSignalInfo(m_RowInfo, "PC4", "PC 4", "PC Channel 4");
+        addSignalInfo(m_RowInfo, "PC5", "PC 5", "PC Channel 5");
+        addSignalInfo(m_RowInfo, "PC6", "PC 6", "PC Channel 6");
+        addSignalInfo(m_RowInfo, "PC7", "PC 7", "PC Channel 7");
+        addSignalInfo(m_RowInfo, "PC8", "PC 8", "PC Channel 8");
+        addSignalInfo(m_RowInfo, "PC9", "PC 9", "PC Channel 9");
+        addSignalInfo(m_RowInfo, "PC10", "PC 10", "PC Channel 10");
+        addSignalInfo(m_RowInfo, "IMIXL", "IMix L", "Input Mix Left");
+        addSignalInfo(m_RowInfo, "IMIXR", "IMix R", "Input Mix Right");
+        
+        addSignalInfo(m_ColInfo, "OUT1", "OUT 1", "Output Channel 1");
+        addSignalInfo(m_ColInfo, "OUT2", "OUT 2", "Output Channel 2");
+        addSignalInfo(m_ColInfo, "OUT3", "OUT 3", "Output Channel 3");
+        addSignalInfo(m_ColInfo, "OUT4", "OUT 4", "Output Channel 4");
+        addSignalInfo(m_ColInfo, "OUT5", "OUT 5", "Output Channel 5");
+        addSignalInfo(m_ColInfo, "OUT6", "OUT 6", "Output Channel 6");
+        addSignalInfo(m_ColInfo, "OUT7", "OUT 7", "Output Channel 7");
+        addSignalInfo(m_ColInfo, "OUT8", "OUT 8", "Output Channel 8");
+        addSignalInfo(m_ColInfo, "OUT9", "OUT 9", "Output Channel 9");
+        addSignalInfo(m_ColInfo, "OUT10", "OUT 10", "Output Channel 10");
+        
+        // init the cell matrix
+        #define FOCUSRITE_SAFFIRE_PRO_OUTMIX_NB_COLS 10
+        #define FOCUSRITE_SAFFIRE_PRO_OUTMIX_NB_ROWS 12
+        
+        std::vector<struct sCellInfo> tmp_cols( FOCUSRITE_SAFFIRE_PRO_OUTMIX_NB_COLS );
+        std::vector< std::vector<struct sCellInfo> > tmp_all(FOCUSRITE_SAFFIRE_PRO_OUTMIX_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_PRO_OUTMIX_NB_ROWS;i++) {
+            for (int j=0;j<FOCUSRITE_SAFFIRE_PRO_OUTMIX_NB_COLS;j++) {
+                m_CellInfo[i][j]=c;
+            }
+        }
+    
+        // now set the cells that are valid
+        setCellInfo(0,0,FOCUSRITE_CMD_ID_PC1_TO_OUT1, true);
+        setCellInfo(1,1,FOCUSRITE_CMD_ID_PC2_TO_OUT2, true);
+        setCellInfo(10,0,FOCUSRITE_CMD_ID_MIX1_TO_OUT1, true);
+        setCellInfo(11,1,FOCUSRITE_CMD_ID_MIX2_TO_OUT2, true);
+        setCellInfo(0,2,FOCUSRITE_CMD_ID_PC1_TO_OUT3, true);
+        setCellInfo(1,3,FOCUSRITE_CMD_ID_PC2_TO_OUT4, true);
+        setCellInfo(2,2,FOCUSRITE_CMD_ID_PC3_TO_OUT3, true);
+        setCellInfo(3,3,FOCUSRITE_CMD_ID_PC4_TO_OUT4, true);
+        setCellInfo(10,2,FOCUSRITE_CMD_ID_MIX1_TO_OUT3, true);
+        setCellInfo(11,3,FOCUSRITE_CMD_ID_MIX2_TO_OUT4, true);
+        setCellInfo(0,4,FOCUSRITE_CMD_ID_PC1_TO_OUT5, true);
+        setCellInfo(1,5,FOCUSRITE_CMD_ID_PC2_TO_OUT6, true);
+        setCellInfo(4,4,FOCUSRITE_CMD_ID_PC5_TO_OUT5, true);
+        setCellInfo(5,5,FOCUSRITE_CMD_ID_PC6_TO_OUT6, true);
+        setCellInfo(10,4,FOCUSRITE_CMD_ID_MIX1_TO_OUT5, true);
+        setCellInfo(11,5,FOCUSRITE_CMD_ID_MIX2_TO_OUT6, true);
+        setCellInfo(0,6,FOCUSRITE_CMD_ID_PC1_TO_OUT7, true);
+        setCellInfo(1,7,FOCUSRITE_CMD_ID_PC2_TO_OUT8, true);
+        setCellInfo(6,6,FOCUSRITE_CMD_ID_PC7_TO_OUT7, true);
+        setCellInfo(7,7,FOCUSRITE_CMD_ID_PC8_TO_OUT8, true);
+        setCellInfo(10,6,FOCUSRITE_CMD_ID_MIX1_TO_OUT7, true);
+        setCellInfo(11,7,FOCUSRITE_CMD_ID_MIX2_TO_OUT8, true);
+        setCellInfo(0,8,FOCUSRITE_CMD_ID_PC1_TO_OUT9, true);
+        setCellInfo(1,9,FOCUSRITE_CMD_ID_PC2_TO_OUT10, true);
+        setCellInfo(8,8,FOCUSRITE_CMD_ID_PC9_TO_OUT9, true);
+        setCellInfo(9,9,FOCUSRITE_CMD_ID_PC10_TO_OUT10, true);
+        setCellInfo(10,8,FOCUSRITE_CMD_ID_MIX1_TO_OUT9, true);
+        setCellInfo(11,9,FOCUSRITE_CMD_ID_MIX2_TO_OUT10, true);
+
+    } else if (type==eMMT_InputMix) {
+        addSignalInfo(m_RowInfo, "AN1", "Analog 1", "Analog Input 1");
+        addSignalInfo(m_RowInfo, "AN2", "Analog 2", "Analog Input 2");
+        addSignalInfo(m_RowInfo, "AN3", "Analog 3", "Analog Input 3");
+        addSignalInfo(m_RowInfo, "AN4", "Analog 4", "Analog Input 4");
+        addSignalInfo(m_RowInfo, "AN5", "Analog 5", "Analog Input 5");
+        addSignalInfo(m_RowInfo, "AN6", "Analog 6", "Analog Input 6");
+        addSignalInfo(m_RowInfo, "AN7", "Analog 7", "Analog Input 7");
+        addSignalInfo(m_RowInfo, "AN8", "Analog 8", "Analog Input 8");
+        addSignalInfo(m_RowInfo, "SPDIFL", "SPDIF L", "SPDIF Left Input");
+        addSignalInfo(m_RowInfo, "SPDIFR", "SPDIF R", "SPDIF Right Input");
+        
+        addSignalInfo(m_RowInfo, "ADAT11", "ADAT1 1", "ADAT1 Channel 1");
+        addSignalInfo(m_RowInfo, "ADAT12", "ADAT1 2", "ADAT1 Channel 2");
+        addSignalInfo(m_RowInfo, "ADAT13", "ADAT1 3", "ADAT1 Channel 3");
+        addSignalInfo(m_RowInfo, "ADAT14", "ADAT1 4", "ADAT1 Channel 4");
+        addSignalInfo(m_RowInfo, "ADAT15", "ADAT1 5", "ADAT1 Channel 5");
+        addSignalInfo(m_RowInfo, "ADAT16", "ADAT1 6", "ADAT1 Channel 6");
+        addSignalInfo(m_RowInfo, "ADAT17", "ADAT1 7", "ADAT1 Channel 7");
+        addSignalInfo(m_RowInfo, "ADAT18", "ADAT1 8", "ADAT1 Channel 8");
+        
+        addSignalInfo(m_RowInfo, "ADAT21", "ADAT2 1", "ADAT2 Channel 1");
+        addSignalInfo(m_RowInfo, "ADAT22", "ADAT2 2", "ADAT2 Channel 2");
+        addSignalInfo(m_RowInfo, "ADAT23", "ADAT2 3", "ADAT2 Channel 3");
+        addSignalInfo(m_RowInfo, "ADAT24", "ADAT2 4", "ADAT2 Channel 4");
+        addSignalInfo(m_RowInfo, "ADAT25", "ADAT2 5", "ADAT2 Channel 5");
+        addSignalInfo(m_RowInfo, "ADAT26", "ADAT2 6", "ADAT2 Channel 6");
+        addSignalInfo(m_RowInfo, "ADAT27", "ADAT2 7", "ADAT2 Channel 7");
+        addSignalInfo(m_RowInfo, "ADAT28", "ADAT2 8", "ADAT2 Channel 8");
+        
+        addSignalInfo(m_ColInfo, "IMIXL", "IMix L", "Input Mix Left");
+        addSignalInfo(m_ColInfo, "IMIXR", "IMix R", "Input Mix Right");
+        
+        // init the cell matrix
+        #define FOCUSRITE_SAFFIRE_PRO_INMIX_NB_COLS 2
+        #define FOCUSRITE_SAFFIRE_PRO_INMIX_NB_ROWS 26
+        
+        std::vector<struct sCellInfo> tmp_cols( FOCUSRITE_SAFFIRE_PRO_INMIX_NB_COLS );
+        std::vector< std::vector<struct sCellInfo> > tmp_all(FOCUSRITE_SAFFIRE_PRO_INMIX_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_PRO_INMIX_NB_ROWS;i++) {
+            for (int j=0;j<FOCUSRITE_SAFFIRE_PRO_INMIX_NB_COLS;j++) {
+                m_CellInfo[i][j]=c;
+            }
+        }
+    
+        // now set the cells that are valid
+        setCellInfo(0,0,FOCUSRITE_CMD_ID_AN1_TO_IMIXL, true);
+        setCellInfo(0,1,FOCUSRITE_CMD_ID_AN1_TO_IMIXR, true);
+        setCellInfo(1,0,FOCUSRITE_CMD_ID_AN2_TO_IMIXL, true);
+        setCellInfo(1,1,FOCUSRITE_CMD_ID_AN2_TO_IMIXR, true);
+        setCellInfo(2,0,FOCUSRITE_CMD_ID_AN3_TO_IMIXL, true);
+        setCellInfo(2,1,FOCUSRITE_CMD_ID_AN3_TO_IMIXR, true);
+        setCellInfo(3,0,FOCUSRITE_CMD_ID_AN4_TO_IMIXL, true);
+        setCellInfo(3,1,FOCUSRITE_CMD_ID_AN4_TO_IMIXR, true);
+        setCellInfo(4,0,FOCUSRITE_CMD_ID_AN5_TO_IMIXL, true);
+        setCellInfo(4,1,FOCUSRITE_CMD_ID_AN5_TO_IMIXR, true);
+        setCellInfo(5,0,FOCUSRITE_CMD_ID_AN6_TO_IMIXL, true);
+        setCellInfo(5,1,FOCUSRITE_CMD_ID_AN6_TO_IMIXR, true);
+        setCellInfo(6,0,FOCUSRITE_CMD_ID_AN7_TO_IMIXL, true);
+        setCellInfo(6,1,FOCUSRITE_CMD_ID_AN7_TO_IMIXR, true);
+        setCellInfo(7,0,FOCUSRITE_CMD_ID_AN8_TO_IMIXL, true);
+        setCellInfo(7,1,FOCUSRITE_CMD_ID_AN8_TO_IMIXR, true);
+        setCellInfo(8,0,FOCUSRITE_CMD_ID_SPDIFL_TO_IMIXL, true);
+        setCellInfo(8,1,FOCUSRITE_CMD_ID_SPDIFL_TO_IMIXR, true);
+        setCellInfo(9,0,FOCUSRITE_CMD_ID_SPDIFR_TO_IMIXL, true);
+        setCellInfo(9,1,FOCUSRITE_CMD_ID_SPDIFR_TO_IMIXR, true);
+
+        setCellInfo(10,0,FOCUSRITE_CMD_ID_ADAT11_TO_IMIXL, true);
+        setCellInfo(10,1,FOCUSRITE_CMD_ID_ADAT11_TO_IMIXR, true);
+        setCellInfo(11,0,FOCUSRITE_CMD_ID_ADAT12_TO_IMIXL, true);
+        setCellInfo(11,1,FOCUSRITE_CMD_ID_ADAT12_TO_IMIXR, true);
+        setCellInfo(12,0,FOCUSRITE_CMD_ID_ADAT13_TO_IMIXL, true);
+        setCellInfo(12,1,FOCUSRITE_CMD_ID_ADAT13_TO_IMIXR, true);
+        setCellInfo(13,0,FOCUSRITE_CMD_ID_ADAT14_TO_IMIXL, true);
+        setCellInfo(13,1,FOCUSRITE_CMD_ID_ADAT14_TO_IMIXR, true);
+        setCellInfo(14,0,FOCUSRITE_CMD_ID_ADAT15_TO_IMIXL, true);
+        setCellInfo(14,1,FOCUSRITE_CMD_ID_ADAT15_TO_IMIXR, true);
+        setCellInfo(15,0,FOCUSRITE_CMD_ID_ADAT16_TO_IMIXL, true);
+        setCellInfo(15,1,FOCUSRITE_CMD_ID_ADAT16_TO_IMIXR, true);
+        setCellInfo(16,0,FOCUSRITE_CMD_ID_ADAT17_TO_IMIXL, true);
+        setCellInfo(16,1,FOCUSRITE_CMD_ID_ADAT17_TO_IMIXR, true);
+        setCellInfo(17,0,FOCUSRITE_CMD_ID_ADAT18_TO_IMIXL, true);
+        setCellInfo(17,1,FOCUSRITE_CMD_ID_ADAT18_TO_IMIXR, true);
+
+        setCellInfo(18,0,FOCUSRITE_CMD_ID_ADAT21_TO_IMIXL, true);
+        setCellInfo(18,1,FOCUSRITE_CMD_ID_ADAT21_TO_IMIXR, true);
+        setCellInfo(19,0,FOCUSRITE_CMD_ID_ADAT22_TO_IMIXL, true);
+        setCellInfo(19,1,FOCUSRITE_CMD_ID_ADAT22_TO_IMIXR, true);
+        setCellInfo(20,0,FOCUSRITE_CMD_ID_ADAT23_TO_IMIXL, true);
+        setCellInfo(20,1,FOCUSRITE_CMD_ID_ADAT23_TO_IMIXR, true);
+        setCellInfo(21,0,FOCUSRITE_CMD_ID_ADAT24_TO_IMIXL, true);
+        setCellInfo(21,1,FOCUSRITE_CMD_ID_ADAT24_TO_IMIXR, true);
+        setCellInfo(22,0,FOCUSRITE_CMD_ID_ADAT25_TO_IMIXL, true);
+        setCellInfo(22,1,FOCUSRITE_CMD_ID_ADAT25_TO_IMIXR, true);
+        setCellInfo(23,0,FOCUSRITE_CMD_ID_ADAT26_TO_IMIXL, true);
+        setCellInfo(23,1,FOCUSRITE_CMD_ID_ADAT26_TO_IMIXR, true);
+        setCellInfo(24,0,FOCUSRITE_CMD_ID_ADAT27_TO_IMIXL, true);
+        setCellInfo(24,1,FOCUSRITE_CMD_ID_ADAT27_TO_IMIXR, true);
+        setCellInfo(25,0,FOCUSRITE_CMD_ID_ADAT28_TO_IMIXL, true);
+        setCellInfo(25,1,FOCUSRITE_CMD_ID_ADAT28_TO_IMIXR, true);
+
+    } else {
+        debugError("Invalid mixer type\n");
+    }
+}
+
+void SaffireProMatrixMixer::show()
+{
+    debugOutput(DEBUG_LEVEL_NORMAL, "Saffire Pro Matrix mixer type %d\n");
+}
+
+std::string SaffireProMatrixMixer::getRowName( const int row )
+{
+    return m_RowInfo.at(row).name;
+}
+
+std::string SaffireProMatrixMixer::getColName( const int col )
+{
+    return m_ColInfo.at(col).name;
+}
+
+int SaffireProMatrixMixer::canWrite( const int row, const int col )
+{
+    return m_CellInfo.at(row).at(col).valid;
+}
+
+double SaffireProMatrixMixer::setValue( const int row, const int col, const double val )
+{
+    uint32_t v=val;
+    struct sCellInfo c=m_CellInfo.at(row).at(col);
+    
+    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 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

@@ -29 +29 @@
-#include "focusrite_generic.h"
-
+#include "libcontrol/MatrixMixer.h"
+
+#include <vector>
+#include <string>
+
-namespace BeBoB {
-namespace Focusrite {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-public:
-    SaffireProDevice( Ieee1394Service& ieee1394Service,
@@ -62 +123 @@
-    VolumeControl * m_Output910[6];
-    
+    SaffireProMatrixMixer * m_InputMixer;
+    SaffireProMatrixMixer * m_OutputMixer;
-};
-