Changeset 2044

Timestamp:

02/27/12 04:34:27 (9 years ago)

Author:

jwoithe

Message:

rme: make the bandwidth limit control do something. This is yet to be extensively tested. This change means that all the FF400 mixer controls are now implemented, although some are yet to be tested and verified as working.

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) (2 diffs)

trunk/libffado/src/rme/fireface_settings_ctrls.cpp

@@ -168 +168 @@
-        }
-
+        case RME_CTRL_LIMIT_BANDWIDTH: {
+            signed int val;
+            switch (v) {
+              case 0: val = FF_DEV_FLASH_BWLIMIT_SEND_ALL_CHANNELS; break;
+              case 1: val = FF_DEV_FLASH_BWLIMIT_NO_ADAT2; break;
+              case 2: val = FF_DEV_FLASH_BWLIMIT_ANALOG_SPDIF_ONLY; break;
+              case 3: val = FF_DEV_FLASH_BWLIMIT_ANALOG_ONLY; break;
+              default:
+                val = FF_DEV_FLASH_BWLIMIT_SEND_ALL_CHANNELS;
+            }
+            if (m_parent.setBandwidthLimit(val) == 0) {
+              m_value = v;
+            }
+            break;
+        }
+
-        // All RME_CTRL_INFO_* controls are read-only.  Warn on attempts to
-        // set these.
@@ -254 +270 @@
-            break;
-        }
+        case RME_CTRL_LIMIT_BANDWIDTH: {
+            signed int val = m_parent.getBandwidthLimit();
+            switch (val) {
+              case FF_DEV_FLASH_BWLIMIT_SEND_ALL_CHANNELS: return 0;
+              case FF_DEV_FLASH_BWLIMIT_NO_ADAT2: return 1;
+              case FF_DEV_FLASH_BWLIMIT_ANALOG_SPDIF_ONLY: return 2;
+              case FF_DEV_FLASH_BWLIMIT_ANALOG_ONLY: return 3;
+              default:
+                return 0;
+            }
+            break;
+        }
-        case RME_CTRL_INFO_MODEL:
-            return m_parent.getRmeModel();

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -203 +203 @@
-        new RmeSettingsCtrl(*this, RME_CTRL_SYNC_REF, 0,
-            "Sync_ref", "Preferred sync ref", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_LIMIT_BANDWIDTH, 0,
+            "Bandwidth_limit", "Bandwidth limit", ""));
-
-    if (m_rme_model == RME_MODEL_FIREFACE400) {

trunk/libffado/src/rme/rme_avdevice.h

@@ -142 +142 @@
-    signed int getSyncRef(void);
-    signed int setSyncRef(signed int ref);
+    signed int getBandwidthLimit(void);
+    signed int setBandwidthLimit(signed int limit);
-
-    /* General information functions */

trunk/libffado/src/rme/rme_avdevice_settings.cpp

@@ -376 +376 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -133 +133 @@
-        log.debug("gain %s[%d] set to %d" % (self.Gains[sender][0], self.Gains[sender][1], a0))
-        self.hw.setMatrixMixerValue(self.Gains[sender][0], 0, self.Gains[sender][1], a0)
+
+    def updateBandwidthLimit(self, a0):
+        # Account for the "No ADAT-2" item which will not be present on
+        # a FF400.
+        if (self.model==RME_MODEL_FF400 and a0>0):
+            a0 = a0 + 1
+        # log.debug("limit update: %d" % (a0));
+        self.hw.setDiscrete('/Control/Bandwidth_limit', a0);
-
-    def updateStreamingState(self):
@@ -244 +252 @@
-            self.phones_level_group.setEnabled(False)
-
+        # Add the "No ADAT-2" item to the bandwidth limit control if the
+        # device is not a FF400.  Set the control to reflect the current
+        # device setting and connect an update signal.
+        if (self.model != RME_MODEL_FF400):
+            self.bandwidth_limit.insertItem(1, "No ADAT-2")
+        val = self.hw.getDiscrete('/Control/Bandwidth_limit')
+        if (self.model==RME_MODEL_FF400 and val>1):
+            val = val - 1
+        self.bandwidth_limit.setCurrentIndex(val);
+        QObject.connect(self.bandwidth_limit, SIGNAL('currentIndexChanged(int)'), self.updateBandwidthLimit)
+
-        # Get current hardware values and connect GUI element signals to 
-        # their respective slots