Changeset 1415

Timestamp:

11/02/08 14:11:22 (4 years ago)

Author:

arnonym

Message:

Quite some stuff:

• add a simple python-parser for the format of the configuration-file already used by ffado
  
• add the names of the mixers to be used to the configuration-file
  
• port the PanelManager? to QMainWindow and introduce a menu and a statusbar
  
• set the icon of the application to the beautiful ffado-icon
  

TODO for the next time:

• overwrite the global config with the local config in PanelManager?
  
• "About FFADO" in the help-menu
  
• maybe also move the names of the mixers python-files into the configuration and load them only on demand. And then use this info also in the SConscript :-)
  
• also add menu-items to recheck the status of the mixer and maybe even the ability to trigger a bus-reset from gui. But that would need ppalmers to implement that action in the dbus-server.
  

Files:

• branches/libffado-2.0/configuration (modified) (16 diffs)
• branches/libffado-2.0/support/mixer-qt4/ffado-mixer.in (modified) (4 diffs)
• branches/libffado-2.0/support/mixer-qt4/ffadomixer_config.py.in (modified) (1 diff)
• branches/libffado-2.0/support/mixer-qt4/ffado_configuration.py (added)
• branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py (modified) (11 diffs)
• branches/libffado-2.0/support/mixer-qt4/SConscript (modified) (2 diffs)

branches/libffado-2.0/configuration

@@ -7 +7 @@
-    driver      = 1; # BeBoB
-},
+{ # Added by arnonym from ffado-mixers list
+    vendorid    = 0x00000f;
+    modelid     = 0x00010067;
+    vendorname  = "Mackie";
+    modelname   = "Onyx Firewire";
+    driver      = 1; # BeBoB
+    mixer       = "MackieOnyxMixer";
+},
-{
-    vendorid    = 0x0003db;
@@ -27 +35 @@
-    modelname   = "Audio 5";
-    driver      = 1; # BeBoB
+    mixer       = "BCoAudio5Control";
-},
-{
@@ -48 +57 @@
-    modelname   = "Phase 88 FW";
-    driver      = 1; # BeBoB
+    mixer       = "Phase88Control";
-},
-{
@@ -55 +65 @@
-    modelname   = "Phase X24 FW (model version 4)";
-    driver      = 1; # BeBoB
+    mixer       = "Phase24Control";
-},
-{
@@ -62 +73 @@
-    modelname   = "Phase X24 FW (model version 7)";
-    driver      = 1; # BeBoB
+    mixer       = "Phase24Control";
-},
-{
@@ -69 +81 @@
-    modelname   = "Quatafire 610";
-    driver      = 1; # BeBoB
+    mixer       = "QuataFireMixer";
-},
-{
@@ -76 +89 @@
-    modelname   = "Saffire Pro26IO";
-    driver      = 1; # BeBoB
+    mixer       = "SaffireProMixer";
-},
-{
@@ -83 +97 @@
-    modelname   = "Saffire Pro10IO";
-    driver      = 1; # BeBoB
+    mixer       = "SaffireProMixer";
-},
-{
@@ -90 +105 @@
-    modelname   = "Saffire (LE)";
-    driver      = 1; # BeBoB
+    mixer       = "SaffireMixer";
-},
-{
@@ -97 +113 @@
-    modelname   = "FA-66";
-    driver      = 1; # BeBoB
+    mixer       = "EdirolFa66Control";
-},
-{
@@ -104 +121 @@
-    modelname   = "FA-101";
-    driver      = 1; # BeBoB
+    mixer       = "EdirolFa101Control";
-},
-{
@@ -146 +164 @@
-    modelname = "AudioFire2";
-    driver = 2;
+    mixer = "AudioFireMixer";
-  }, 
-  {
@@ -153 +172 @@
-    modelname = "AudioFire4";
-    driver = 2;
+    mixer = "AudioFireMixer";
-  }, 
-  {
@@ -160 +180 @@
-    modelname = "AudioFire8";
-    driver = 2;
+    mixer = "AudioFireMixer";
-  }, 
-  {
@@ -167 +188 @@
-    modelname = "AudioFire12";
-    driver = 2;
+    mixer = "AudioFireMixer";
-  }, 
-  {
@@ -202 +224 @@
-    modelname = "Onyx 1200F";
-    driver = 2;
+  },
+  { # added by arnonym from ffado-mixers list
+    vendorid = 0x0001f2;
+    modelid = 0x00000000;
+    vendorname = "Motu";
+    modelname = "All of them";
+    driver = 10;
+    mixer = "MotuMixer";
-  }
-);

branches/libffado-2.0/support/mixer-qt4/ffado-mixer.in

@@ -32 +32 @@
-sys.path.append( "$PYTHONDIR" )
-
-
+* #
-
-import os
@@ -38 +38 @@
-
-from PyQt4.QtCore import SIGNAL, SLOT, QObject, QTimer
-
+, QIcon
-
-from ffado_dbus_util import *
@@ -49 +49 @@
-    logging.basicConfig()
-
-$
+
-        debug_level = logging.DEBUG
-    else:
@@ -76 +76 @@
-
-    app = QApplication(sys.argv)
+    app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) )
-
-    msg = QMessageBox()

branches/libffado-2.0/support/mixer-qt4/ffadomixer_config.py.in

@@ -10 +10 @@
-
-POLL_SLEEP_TIME_MSEC = 100 # 100ms
+
+PYTHONDIR = "$PYTHONDIR"
+SHAREDIR = "$SHAREDIR"
+
+DEBUG = $DEBUG

branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py

@@ -22 +22 @@
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-
-
+
+
+
+
-from PyQt4.QtCore import QTimer
-
@@ -31 +32 @@
-from ffado_dbus_util import *
-from ffado_registration import *
+
+from ffado_configuration import DeviceList
-
-from mixer_phase88 import *
@@ -60 +63 @@
-    use_generic = True
-
-SupportedDevices=[
-    [(0x000aac, 0x00000003),'Phase88Control'],
-    [(0x000aac, 0x00000004),'Phase24Control'],
-    [(0x000aac, 0x00000007),'Phase24Control'],
-    [(0x00130e, 0x00000003),'SaffireProMixer'],
-    [(0x00130e, 0x00000006),'SaffireProMixer'],
-    [(0x00130e, 0x00000000),'SaffireMixer'],
-    [(0x001486, 0x00000af2),'AudioFireMixer'],
-    [(0x001486, 0x00000af4),'AudioFireMixer'],
-    [(0x001486, 0x00000af8),'AudioFireMixer'],
-    [(0x001486, 0x0000af12),'AudioFireMixer'],
-    [(0x0007f5, 0x00010049),'BCoAudio5Control'],
-    [(0x0040AB, 0x00010049),'EdirolFa66Control'],
-    [(0x0040AB, 0x00010048),'EdirolFa101Control'],
-    [(0x00000f, 0x00010067),'MackieOnyxMixer'],
-    [(0x000f1b, 0x00010064),'QuataFireMixer'],
-    [(0x0001f2, 0x00000000),'MotuMixer'],
-    ]
-
-# pseudo-guid
-GUID_GENERIC_MIXER = 0
@@ -95 +79 @@
-        self.setupUi(self)
-
-Widget
+MainWindow
-    def __init__(self, parent, devmgr):
-Widget
+MainWindow
-        self.devmgr = devmgr
-        self.devmgr.registerPreUpdateCallback(self.devlistPreUpdate)
@@ -104 +88 @@
-        self.devmgr.registerDestroyedCallback(self.devmgrDestroyed)
-
+        filemenu = self.menuBar().addMenu( "File" )
+        quitaction = QAction( "Quit", self )
+        quitaction.setShortcut( self.tr("Ctrl+q") )
+        self.connect( quitaction, SIGNAL( "triggered()" ), self, SLOT( "close()" ) )
+        filemenu.addAction( quitaction )
+        helpmenu = self.menuBar().addMenu( "Help" )
+        aboutqtaction = QAction( "About Qt", self )
+        self.connect( aboutqtaction, SIGNAL( "triggered()" ), qApp, SLOT( "aboutQt()" ) )
+        helpmenu.addAction( aboutqtaction )
+
+        self.statusBar().showMessage( "Initializing...", 5000 )
+
-        # maps a device GUID to a QT panel
-        self.panels = {}
-
-        # a layout for ourselves
-
+
+
+
-
-        # the tabs
-self
+mw
-        self.tabs.hide()
-        self.layout.addWidget(self.tabs)
-
-        # a dialog that is shown during update
-self
+mw
-        self.status.lblMessage.setText("Initializing...")
-        self.layout.addWidget(self.status)
@@ -126 +124 @@
-        self.alivetimer.start( 2000 )
-
+        self.devices = DeviceList( "%s/configuration" % SHAREDIR )
+
-    def count(self):
-        return self.tabs.count()
-
-    def pollPanels(self):
+        log.debug("PanelManager::pollPanels()")
-        # only when not modifying the tabs
-        if self.tabs.isEnabled():
@@ -149 +150 @@
-        self.status.lblMessage.setText("Bus reconfiguration in progress, please wait...")
-        self.status.show()
+        self.statusBar().showMessage("bus reconfiguration in progress...", 5000)
-
-    def devlistPostUpdate(self):
@@ -200 +202 @@
-
-    def updatePanels(self):
+        log.debug("PanelManager::updatePanels()")
-        nbDevices = self.devmgr.getNbDevices()
+        self.statusBar().showMessage("Reconfiguring the mixer panels...")
-
-        # list of panels present
@@ -263 +267 @@
-            reg.check_for_registration()
-
-            thisdev = (vendorId, modelId);
-            # The MOTU devices use unitVersion to differentiate models.  For the
-            # moment thought we don't need to know precisely which model we're
-            # using.
-            if vendorId == 0x1f2:
-
-
-
-
-
-
+
+
+
-
-            w = QWidget( )
@@ -304 +304 @@
-            # Specific (or dummy) mixer widgets get loaded in the following
-            #
-dev
-1
+'mixer' in dev and dev['mixer']
+'mixer'
-                exec( "mixerwidget = "+mixerapp+"( w )" )
-            else:
@@ -339 +339 @@
-            self.status.lblMessage.setText("No supported device found.")
-            self.status.show()
+            self.statusBar().showMessage("No supported device found.", 5000)
-        else:
-            self.tabs.show()
-            self.tabs.setEnabled(True)
-            self.status.hide()
+            self.statusBar().showMessage("Configured the mixer for %i devices." % self.tabs.count())
-            if use_generic:
-                #

branches/libffado-2.0/support/mixer-qt4/SConscript

@@ -61 +61 @@
-                      'ffado_regdialog',
-                      'ffado_panelmanager',
+                      'ffado_configuration',
-                      'mixer_saffire_base'
-                     ]
@@ -97 +98 @@
-    e.Install( "$bindir", "ffado-mixer" )
-
+    e.Install( "$sharedir/icons", "../xdg/hi64-apps-ffado.png" )