Changeset 2033 for trunk

Timestamp:

02/03/12 03:15:10 (9 years ago)

Author:

jwoithe

Message:

rme: implement SPDIF output option control via ffado-mixer. Again, I haven't the means to confirm whether these settings have the desired effect on the SPDIF bitstream yet.

Files:

• trunk/libffado/src/rme/fireface_settings_ctrls.cpp (modified) (2 diffs)
• trunk/libffado/src/rme/fireface_settings_ctrls.h (modified) (1 diff)
• 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) (4 diffs)

trunk/libffado/src/rme/fireface_settings_ctrls.cpp

@@ -120 +120 @@
-            }
-            break;
+        case RME_CTRL_SPDIF_OUTPUT_OPTICAL:
+            if (m_parent.setSpdifOutputIsOptical(v!=0) == 0) {
+               m_value = (v != 0);
+            }
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_PRO:
+            if (m_parent.setSpdifOutputProOn(v!=0) == 0) {
+               m_value = (v != 0);
+            }
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_EMPHASIS:
+            if (m_parent.setSpdifOutputEmphasisOn(v!=0) == 0) {
+               m_value = (v != 0);
+            }
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_NONAUDIO:
+            if (m_parent.setSpdifOutputNonAudioOn(v!=0) == 0) {
+               m_value = (v != 0);
+            }
+            break;
-        case RME_CTRL_PHONES_LEVEL:
-            if (m_parent.setPhonesLevel(v)) {
@@ -173 +193 @@
-            i = m_parent.getSpdifInputMode();
-            return i==FF_SWPARAM_SPDIF_INPUT_COAX?0:1;
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_OPTICAL:
+            return m_parent.getSpdifOutputIsOptical();
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_PRO:
+            return m_parent.getSpdifOutputProOn();
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_EMPHASIS:
+            return m_parent.getSpdifOutputEmphasisOn();
+            break;
+        case RME_CTRL_SPDIF_OUTPUT_NONAUDIO:
+            return m_parent.getSpdifOutputNonAudioOn();
-            break;
-        case RME_CTRL_PHONES_LEVEL:

trunk/libffado/src/rme/fireface_settings_ctrls.h

@@ -33 +33 @@
-#define RME_CTRL_PHANTOM_SW            0x0001
-#define RME_CTRL_SPDIF_INPUT_MODE      0x0002
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#define RME_CTRL_INFO_MODEL            0x0100

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -164 +164 @@
-            "SPDIF_input_mode", "SPDIF input mode", ""));
-    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_SPDIF_OUTPUT_OPTICAL, 0,
+            "SPDIF_output_optical", "SPDIF output optical", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_SPDIF_OUTPUT_EMPHASIS, 0,
+            "SPDIF_output_emphasis", "SPDIF output emphasis", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_SPDIF_OUTPUT_PRO, 0,
+            "SPDIF_output_pro", "SPDIF output pro", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_SPDIF_OUTPUT_NONAUDIO, 0,
+            "SPDIF_output_nonaudio", "SPDIF output non-audio", ""));
+    result &= m_ControlContainer->addElement(
-        new RmeSettingsCtrl(*this, RME_CTRL_PHONES_LEVEL, 0,
-            "Phones_level", "Phones level", ""));

trunk/libffado/src/rme/rme_avdevice.h

@@ -118 +118 @@
-    signed int getSpdifInputMode(void);
-    signed int setSpdifInputMode(signed int mode);
+    signed int getSpdifOutputIsOptical(void);
+    signed int setSpdifOutputIsOptical(signed int enable);
+    signed int getSpdifOutputEmphasisOn(void);
+    signed int setSpdifOutputEmphasisOn(signed int enable);
+    signed int getSpdifOutputNonAudioOn(void);
+    signed int setSpdifOutputNonAudioOn(signed int enable);
+    signed int getSpdifOutputProOn(void);
+    signed int setSpdifOutputProOn(signed int enable);
-    signed int getAmpGain(unsigned int index);
-    signed int setAmpGain(unsigned int index, signed int val);

trunk/libffado/src/rme/rme_avdevice_settings.cpp

@@ -157 +157 @@
-    set_hardware_params();
-    return 0;
+}
+
+signed int
+Device::getSpdifOutputIsOptical(void) {
+    return settings->spdif_output_mode == FF_SWPARAM_SPDIF_OUTPUT_OPTICAL;
+}
+signed int
+Device::setSpdifOutputIsOptical(signed int enable) {
+  settings->spdif_output_mode = enable==1?FF_SWPARAM_SPDIF_OUTPUT_OPTICAL:FF_SWPARAM_SPDIF_OUTPUT_COAX;
+  set_hardware_params();
+  return 0;
+}
+signed int
+Device::getSpdifOutputEmphasisOn(void) {
+    return settings->spdif_output_emphasis == FF_SWPARAM_SPDIF_OUTPUT_EMPHASIS_ON;
+}
+signed int
+Device::setSpdifOutputEmphasisOn(signed int enable) {
+  settings->spdif_output_emphasis = enable==1?FF_SWPARAM_SPDIF_OUTPUT_EMPHASIS_ON:0;
+  set_hardware_params();
+  return 0;
+}
+signed int
+Device::getSpdifOutputNonAudioOn(void) {
+    return settings->spdif_output_nonaudio == FF_SWPARAM_SPDIF_OUTPUT_NONAUDIO_ON;
+}
+signed int
+Device::setSpdifOutputNonAudioOn(signed int enable) {
+  settings->spdif_output_nonaudio = enable==1?FF_SWPARAM_SPDIF_OUTPUT_NONAUDIO_ON:0;
+  set_hardware_params();
+  return 0;
+}
+signed int
+Device::getSpdifOutputProOn(void) {
+    return settings->spdif_output_pro == FF_SWPARAM_SPDIF_OUTPUT_PRO_ON;
+}
+signed int
+Device::setSpdifOutputProOn(signed int enable) {
+  settings->spdif_output_pro = enable==1?FF_SWPARAM_SPDIF_OUTPUT_PRO_ON:0;
+  set_hardware_params();
+  return 0;
-}
-

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

@@ -58 +58 @@
-            self.ff400_chan4_opt_instr: ['/Control/Chan4_opt_instr'],
-            self.ff400_chan4_opt_pad:   ['/Control/Chan4_opt_pad'],
+
+            self.spdif_output_optical:  ['/Control/SPDIF_output_optical', 0],
+            self.spdif_output_emphasis: ['/Control/SPDIF_output_emphasis', 0],
+            self.spdif_output_pro:      ['/Control/SPDIF_output_pro', 0],
+            self.spdif_output_nonaudio: ['/Control/SPDIF_output_nonaudio', 0],
-        }
-

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

@@ -513 +513 @@
-            <layout class="QGridLayout" name="gridLayout_6">
-             <item row="0" column="0">
-checkBox
+spdif_output_optical
-               <property name="text">
-                <string>Optical</string>
@@ -520 +520 @@
-             </item>
-             <item row="0" column="1">
-checkBox_3
+spdif_output_emphasis
-               <property name="text">
-                <string>Emphasis</string>
@@ -527 +527 @@
-             </item>
-             <item row="1" column="0">
-checkBox_2
+spdif_output_pro
-               <property name="text">
-                <string>Professional</string>
@@ -534 +534 @@
-             </item>
-             <item row="1" column="1">
-checkBox_4
+spdif_output_nonaudio
-               <property name="text">
-                <string>Non-audio</string>