Changeset 2038 for trunk/libffado/support

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

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>