Changeset 1060

Timestamp:

04/28/08 11:21:21 (14 years ago)

Author:

ppalmers

Message:

- implement (basic) user feedback (fixes #77)
- fix some small issues in the mixer code

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/SConstruct (modified) (1 diff)
• trunk/libffado/support/mixer/ffadomixer.in (modified) (7 diffs)
• trunk/libffado/support/mixer/ffadomixer_config.py.in (added)
• trunk/libffado/support/mixer/ffado_regdialog.py (added)
• trunk/libffado/support/mixer/ffado_regdialog.ui (added)
• trunk/libffado/support/mixer/ffado_registration.py (added)
• trunk/libffado/support/mixer/mixer_dummy.py (added)
• trunk/libffado/support/mixer/mixer_dummy.ui (added)
• trunk/libffado/support/mixer/SConscript (modified) (2 diffs)

trunk/libffado/config.h.in

@@ -27 +27 @@
-#define FFADO_API_VERSION $FFADO_API_VERSION
-
-~/.ffado
+$CONFIGDIR
-
-#define BINDIR "$BINDIR"

trunk/libffado/SConstruct

@@ -411 +411 @@
-env['LIBVERSION'] = "1.0.0"
-
+env['CONFIGDIR'] = "~/.ffado"
+
+env['REGISTRATION_URL'] = "http://ffado.org/deviceregistration/register.php?action=register"
+
-#
-# To have the top_srcdir as the doxygen-script is used from auto*

trunk/libffado/support/mixer/ffadomixer.in

@@ -24 +24 @@
-
-import sys
+
-# Add the path of the installed ffado-mixer-modules
-sys.path.append( "$PYTHONDIR" )
+
+from ffadomixer_config import FFADO_VERSION
-
-import os
@@ -31 +34 @@
-import dbus
-from qt import *
+
+from ffado_registration import *
-
-from mixer_phase88 import *
@@ -43 +48 @@
-from mixer_quatafire import *
-from mixer_motu import *
+from mixer_dummy import *
-
-from mixer_generic import *
@@ -238 +244 @@
-                    except dbus.DBusException, ex:
-                        time.sleep( 1 )
-
+
-    nbDevices=devmgr.getNbDevices()
-    
@@ -251 +257 @@
-        unitVersion = cfgrom.getUnitVersion()
-        GUID = cfgrom.getGUID()
-
-
+
+
+
+
+
+
+
+
+
+
-        thisdev=(vendorId, modelId);
-        # The MOTU devices use unitVersion to differentiate models.  For the
@@ -260 +274 @@
-            thisdev=(vendorId, 0x00000000)
-        
+        found_panel = False
-        for dev in SupportedDevices:
-            if dev[0] == thisdev:
@@ -275 +290 @@
-                exec('forms.append('+mixerapp+'())')
-                forms[idx].hw = ControlInterface(server, basepath+'/DeviceManager/'+path)
+                forms[idx].configrom = cfgrom
-                forms[idx].clockselect = ClockSelectInterface(server, basepath+'/DeviceManager/'+path)
-                forms[idx].initValues()
-                forms[idx].show()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        forms.append( GenericMixer( devmgr.bus, server ) )
-0
+-1
-
-    if forms:
-
+
+
-
-        QObject.connect(app,SIGNAL("lastWindowClosed()"),app,SLOT("quit()"))

trunk/libffado/support/mixer/SConscript

@@ -32 +32 @@
-        e['MIXERAPPS'] = [ 'phase24', 'phase88', 'saffirepro', 'saffire',
-                           'saffirele', 'af2', 'bcoaudio5', 'edirolfa66',
-
+
+
+
+
+
-        #
-        # For the ffadomixer.in
@@ -46 +50 @@
-                e.Install( "$pythondir", app+".py" )
-
+        for app in e['OTHERAPPS']:
+                if os.path.exists( app+".ui" ):
+                        e.PyUIC( source=app+".ui", target=app+"ui.py" )
+                        e.Install( "$pythondir", app+"ui.py" )
+                e.Install( "$pythondir", app+".py" )
+
+        e.ScanReplace( "ffadomixer_config.py.in" )
+        e.Depends( "ffadomixer_config.py", "#/SConstruct" )
+        e.Install( "$pythondir", "ffadomixer_config.py" )
+
-        e.ScanReplace( "ffadomixer.in" )
+        e.Depends( "ffadomixer", "#/SConstruct" )
-        e.Depends( "ffadomixer", "SConscript" )
-        e.Install( "$bindir", "ffadomixer" )