Changeset 2038

Timestamp:

02/07/12 04:11:19 (4 months ago)

Author:

jwoithe

Message:

rme: various information panes are now active in ffado-mixer: sync check, autosync reference, spdif freqency and system clock. The function of these in the presence of actual external sync sources is yet to be confirmed. The system clock information has been confirmed to update when the clock mode and/or sample rate controls are altered.

Files:

• trunk/libffado/src/rme/fireface_settings_ctrls.cpp (modified) (3 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/support/mixer-qt4/ffado/mixer/rme.py (modified) (4 diffs)
• trunk/libffado/support/mixer-qt4/ffado/mixer/rme.ui (modified) (9 diffs)

trunk/libffado/src/rme/fireface_settings_ctrls.cpp

@@ -156 +156 @@
-        case RME_CTRL_INFO_MODEL:
-        case RME_CTRL_INFO_TCO_PRESENT:
+        case RME_CTRL_INFO_SYSCLOCK_FREQ:
+        case RME_CTRL_INFO_AUTOSYNC_FREQ:
+        case RME_CTRL_INFO_AUTOSYNC_SRC:
+        case RME_CTRL_INFO_SYNC_STATUS:
+        case RME_CTRL_INFO_SPDIF_FREQ:
-            debugOutput(DEBUG_LEVEL_ERROR, "Attempt to set readonly info control 0x%08x\n", m_type);
-            err = 1;
@@ -173 +178 @@
-signed int i;
-signed int val = 0;
+FF_state_t ff_state;
-
-    switch (m_type) {
@@ -225 +231 @@
-        case RME_CTRL_INFO_TCO_PRESENT:
-            return m_parent.getTcoPresent();
+
+        case RME_CTRL_INFO_SYSCLOCK_MODE:
+            if (m_parent.get_hardware_state(&ff_state) == 0)
+                return ff_state.clock_mode;
+            break;
+        case RME_CTRL_INFO_SYSCLOCK_FREQ:
+            return m_parent.getSamplingFrequency();
+        case RME_CTRL_INFO_AUTOSYNC_FREQ:
+            if (m_parent.get_hardware_state(&ff_state) == 0)
+                return ff_state.autosync_freq;
+            break;
+        case RME_CTRL_INFO_AUTOSYNC_SRC:
+            if (m_parent.get_hardware_state(&ff_state) == 0)
+                return ff_state.autosync_source;
+            break;
+        case RME_CTRL_INFO_SYNC_STATUS:
+            if (m_parent.get_hardware_state(&ff_state) == 0)
+                return (ff_state.adat1_sync_status) |
+                       (ff_state.adat2_sync_status << 2) |
+                       (ff_state.spdif_sync_status << 4) |
+                       (ff_state.wclk_sync_status << 6) |
+                       (ff_state.tco_sync_status << 8);
+            break;
+        case RME_CTRL_INFO_SPDIF_FREQ:
+            if (m_parent.get_hardware_state(&ff_state) == 0)
+                return ff_state.spdif_freq;
+            break;
-
-        default:

trunk/libffado/src/rme/fireface_settings_ctrls.h

@@ -54 +54 @@
-#define RME_CTRL_INFO_MODEL            0x0100
-#define RME_CTRL_INFO_TCO_PRESENT      0x0200
+#define RME_CTRL_INFO_SYSCLOCK_MODE    0x0300
+#define RME_CTRL_INFO_SYSCLOCK_FREQ    0x0301
+#define RME_CTRL_INFO_AUTOSYNC_FREQ    0x0310
+#define RME_CTRL_INFO_AUTOSYNC_SRC     0x0311
+#define RME_CTRL_INFO_SYNC_STATUS      0x0312
+#define RME_CTRL_INFO_SPDIF_FREQ       0x0313
-
-/* Control types for an RmeSettingsMatrixCtrl object */

trunk/libffado/src/rme/rme_avdevice.cpp

@@ -150 +150 @@
-        new RmeSettingsCtrl(*this, RME_CTRL_INFO_TCO_PRESENT, 0,
-            "TCO_present", "TCO is present", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_INFO_SYSCLOCK_MODE, 0,
+            "sysclock_mode", "System clock mode", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_INFO_SYSCLOCK_FREQ, 0,
+            "sysclock_freq", "System clock frequency", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_INFO_AUTOSYNC_FREQ, 0,
+            "autosync_freq", "Autosync frequency", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_INFO_AUTOSYNC_SRC, 0,
+            "autosync_src", "Autosync source", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_INFO_SYNC_STATUS, 0,
+            "sync_status", "Sync status", ""));
+    result &= m_ControlContainer->addElement(
+        new RmeSettingsCtrl(*this, RME_CTRL_INFO_SPDIF_FREQ, 0,
+            "spdif_freq", "SPDIF frequency", ""));
-
-    result &= m_ControlContainer->addElement(

trunk/libffado/src/rme/rme_avdevice.h

@@ -190 +190 @@
-    signed int get_hardware_status(unsigned int *stat0, unsigned int *stat1);
-    signed int get_hardware_streaming_status(unsigned int *stat, unsigned int n);
+public:
-    signed int get_hardware_state(FF_state_t *state);
+private:
-    signed int set_hardware_params(FF_software_settings_t *use_settings = NULL);
-

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

@@ -23 +23 @@
-from PyQt4 import QtGui
-
-
+, QTimer
-from PyQt4.QtGui import QWidget, QApplication
-from ffado.config import *
@@ -127 +127 @@
-        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 status_update(self):
+        # log.debug("timer event")
+        clk_mode = ['Master', 'Slave']
+        src_str = ['None', 'ADAT 1', 'ADAT 2', 'SPDIF', 'Wordclock', 'TCO']
+        sync_stat = ['No lock', 'Locked', 'Synced']
+        sysclock_mode = self.hw.getDiscrete('/Control/sysclock_mode')
+        sysclock_freq = self.hw.getDiscrete('/Control/sysclock_freq')
+        autosync_freq = self.hw.getDiscrete('/Control/autosync_freq')
+        autosync_src = self.hw.getDiscrete('/Control/autosync_src')
+        sync_status = self.hw.getDiscrete('/Control/sync_status')
+        spdif_freq = self.hw.getDiscrete('/Control/spdif_freq')
+        self.sysclock_freq.setText("%d Hz" % (sysclock_freq))
+        self.sysclock_mode.setText(clk_mode[sysclock_mode])
+        self.autosync_freq.setText("%d Hz" % (autosync_freq))
+        self.autosync_src.setText(src_str[autosync_src])
+        self.sync_check_adat1_status.setText(sync_stat[sync_status & 0x03])
+        self.sync_check_adat2_status.setText(sync_stat[(sync_status >> 2) & 0x03])
+        self.sync_check_spdif_status.setText(sync_stat[(sync_status >> 4) & 0x03])
+        self.sync_check_wclk_status.setText(sync_stat[(sync_status >> 6) & 0x03])
+        self.sync_check_tco_status.setText(sync_stat[(sync_status >> 8) & 0x03])
+        self.spdif_freq.setText("%d Hz" % (spdif_freq))
-
-    # Hide and disable a control
@@ -193 +215 @@
-            self.sync_check_adat2_label.setEnabled(False)
-            self.sync_check_adat2_status.setEnabled(False)
+
+        if (not(self.tco_present)):
+            self.sync_check_tco_label.setEnabled(False)
+            self.sync_check_tco_status.setEnabled(False)
-
-        # Only the FF400 has specific channel 3/4 options, input gain
@@ -250 +276 @@
-            QObject.connect(ctrl, SIGNAL('valueChanged(int)'), self.updateGain)
-
+        self.update_timer = QTimer(self)
+        QObject.connect(self.update_timer, SIGNAL('timeout()'), self.status_update)
+        self.update_timer.start(1000)
+
-# vim: et

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

@@ -763 +763 @@
-             </item>
-             <item row="0" column="1">
-label_6
+sync_check_wclk_status
-               <property name="text">
-                <string>No lock</string>
@@ -777 +777 @@
-             </item>
-             <item row="1" column="1">
-label_8
+sync_check_adat1_status
-               <property name="text">
-                <string>No lock</string>
@@ -805 +805 @@
-             </item>
-             <item row="3" column="1">
-label_12
+sync_check_spdif_status
-               <property name="text">
-                <string>No lock</string>
@@ -812 +812 @@
-             </item>
-             <item row="4" column="0">
+              <widget class="QLabel" name="sync_check_tco_label">
+               <property name="text">
+                <string>TCO</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="1">
+              <widget class="QLabel" name="sync_check_tco_status">
+               <property name="text">
+                <string>No lock</string>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="0">
-              <spacer name="verticalSpacer_16">
-               <property name="orientation">
@@ -841 +855 @@
-             </item>
-             <item row="0" column="1">
-label_2
+autosync_src
-               <property name="text">
-                <string>[unset]</string>
@@ -855 +869 @@
-             </item>
-             <item row="1" column="1">
-label_4
+autosync_freq
-               <property name="text">
-                <string>[unset]</string>
@@ -908 +922 @@
-            <layout class="QVBoxLayout" name="verticalLayout_7">
-             <item>
-label_13
+spdif_freq
-               <property name="text">
-                <string>48 kHz</string>
@@ -991 +1005 @@
-             </item>
-             <item row="0" column="1">
-label_15
+sysclock_mode
-               <property name="text">
-                <string>Slave</string>
@@ -1005 +1019 @@
-             </item>
-             <item row="1" column="1">
-label_17
+sysclock_freq
-               <property name="text">
-                <string>44100 kHz</string>