Changeset 2032

Timestamp:

02/03/12 02:35:02 (9 years ago)

Author:

jwoithe

Message:

rme: implement SPDIF input mode selection via ffado-mixer. Whether this has the desired effect on the device remains to be seen - I do not have anything to test the mode of the optical port right now.

Files:

• trunk/libffado/src/rme/fireface_settings_ctrls.cpp (modified) (2 diffs)
• trunk/libffado/src/rme/rme_avdevice.cpp (modified) (1 diff)
• trunk/libffado/src/rme/rme_avdevice.h (modified) (1 diff)
• trunk/libffado/src/rme/rme_avdevice_settings.cpp (modified) (1 diff)
• trunk/libffado/support/mixer-qt4/ffado/mixer/rme.py (modified) (1 diff)
• trunk/libffado/support/mixer-qt4/ffado/mixer/rme.ui (modified) (1 diff)

trunk/libffado/src/rme/fireface_settings_ctrls.cpp

@@ -115 +115 @@
-            }
-            break;
+        case RME_CTRL_SPDIF_INPUT_MODE:
+            if (m_parent.setSpdifInputMode(v==0?FF_SWPARAM_SPDIF_INPUT_COAX:FF_SWPARAM_SPDIF_INPUT_OPTICAL)) {
+                m_value = v;
+            }
+            break;
-        case RME_CTRL_PHONES_LEVEL:
-            if (m_parent.setPhonesLevel(v)) {
@@ -164 +169 @@
-        case RME_CTRL_FF400_INSTR_SW:
-            return m_parent.getInputInstrOpt(m_info);
+            break;
+        case RME_CTRL_SPDIF_INPUT_MODE:
+            i = m_parent.getSpdifInputMode();
+            return i==FF_SWPARAM_SPDIF_INPUT_COAX?0:1;
-            break;
-        case RME_CTRL_PHONES_LEVEL:

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -161 +161 @@
-            "Output_level", "Output level", ""));
-    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_SPDIF_INPUT_MODE, 0,
+            "SPDIF_input_mode", "SPDIF input mode", ""));
+    result &= m_ControlContainer->addElement(
-        new RmeSettingsCtrl(*this, RME_CTRL_PHONES_LEVEL, 0,
-            "Phones_level", "Phones level", ""));

trunk/libffado/src/rme/rme_avdevice.h

@@ -116 +116 @@
-    signed int getInputInstrOpt(unsigned int channel);
-    signed int setInputInstrOpt(unsigned int channel, unsigned int status);
+    signed int getSpdifInputMode(void);
+    signed int setSpdifInputMode(signed int mode);
-    signed int getAmpGain(unsigned int index);
-    signed int setAmpGain(unsigned int index, signed int val);

trunk/libffado/src/rme/rme_avdevice_settings.cpp

@@ -143 +143 @@
-    }
-    settings->ff400_instr_input[channel-3] = (status != 0);
+    set_hardware_params();
+    return 0;
+}
+
+signed int 
+Device::getSpdifInputMode(void) {
+    return settings->spdif_input_mode;
+}
+
+signed int 
+Device::setSpdifInputMode(signed int mode) {
+    settings->spdif_input_mode = mode;
-    set_hardware_params();
-    return 0;

trunk/libffado/support/mixer-qt4/ffado/mixer/rme.py

@@ -68 +68 @@
-            self.level_out_p4dBu:   ['/Control/Output_level', 2],
-            self.level_out_m10dBV:  ['/Control/Output_level', 3],
+
+            self.spdif_input_coax:    ['/Control/SPDIF_input_mode', 0],
+            self.spdif_input_optical: ['/Control/SPDIF_input_mode', 1],
-
-            self.phones_hi_gain: ['/Control/Phones_level', 1],

trunk/libffado/support/mixer-qt4/ffado/mixer/rme.ui

@@ -474 +474 @@
-            <layout class="QVBoxLayout" name="verticalLayout_2">
-             <item>
-
+
+
+
+
+
+
+
+
-               <property name="text">
-                <string>Optical</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QRadioButton" name="radioButton_2">
-               <property name="text">
-                <string>Coax</string>
-               </property>
-              </widget>