Changeset 1060
- Timestamp:
- 04/28/08 11:21:21 (15 years ago)
- 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)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/config.h.in
r1046 r1060 27 27 #define FFADO_API_VERSION $FFADO_API_VERSION 28 28 29 #define CACHEDIR " ~/.ffado"29 #define CACHEDIR "$CONFIGDIR" 30 30 31 31 #define BINDIR "$BINDIR" trunk/libffado/SConstruct
r1052 r1060 411 411 env['LIBVERSION'] = "1.0.0" 412 412 413 env['CONFIGDIR'] = "~/.ffado" 414 415 env['REGISTRATION_URL'] = "http://ffado.org/deviceregistration/register.php?action=register" 416 413 417 # 414 418 # To have the top_srcdir as the doxygen-script is used from auto* trunk/libffado/support/mixer/ffadomixer.in
r994 r1060 24 24 25 25 import sys 26 26 27 # Add the path of the installed ffado-mixer-modules 27 28 sys.path.append( "$PYTHONDIR" ) 29 30 from ffadomixer_config import FFADO_VERSION 28 31 29 32 import os … … 31 34 import dbus 32 35 from qt import * 36 37 from ffado_registration import * 33 38 34 39 from mixer_phase88 import * … … 43 48 from mixer_quatafire import * 44 49 from mixer_motu import * 50 from mixer_dummy import * 45 51 46 52 from mixer_generic import * … … 238 244 except dbus.DBusException, ex: 239 245 time.sleep( 1 ) 240 246 241 247 nbDevices=devmgr.getNbDevices() 242 248 … … 251 257 unitVersion = cfgrom.getUnitVersion() 252 258 GUID = cfgrom.getGUID() 253 print " Found (%s, %X, %X) %s %s" % (str(GUID), vendorId, modelId, cfgrom.getVendorName(), cfgrom.getModelName()) 254 259 vendorName = cfgrom.getVendorName() 260 modelName = cfgrom.getModelName() 261 print " Found (%s, %X, %X) %s %s" % (str(GUID), vendorId, modelId, vendorName, modelName) 262 263 # check whether this has already been registered at ffado.org 264 reg = ffado_registration(FFADO_VERSION, int(GUID, 16), 265 vendorId, modelId, 266 vendorName, modelName) 267 reg.check_for_registration() 268 255 269 thisdev=(vendorId, modelId); 256 270 # The MOTU devices use unitVersion to differentiate models. For the … … 260 274 thisdev=(vendorId, 0x00000000) 261 275 276 found_panel = False 262 277 for dev in SupportedDevices: 263 278 if dev[0] == thisdev: … … 275 290 exec('forms.append('+mixerapp+'())') 276 291 forms[idx].hw = ControlInterface(server, basepath+'/DeviceManager/'+path) 292 forms[idx].configrom = cfgrom 277 293 forms[idx].clockselect = ClockSelectInterface(server, basepath+'/DeviceManager/'+path) 278 294 forms[idx].initValues() 279 295 forms[idx].show() 280 281 if not forms and nbDevices > 0: 296 found_panel = True 297 298 if not found_panel: 299 forms.append( DummyMixer( ) ) 300 forms[idx].hw = ControlInterface(server, basepath+'/DeviceManager/'+path) 301 forms[idx].configrom = cfgrom 302 forms[idx].clockselect = ClockSelectInterface(server, basepath+'/DeviceManager/'+path) 303 forms[idx].initValues() 304 forms[idx].show() 305 306 # note: the generic mixer is disabled for now... 307 use_generic = False # !!! HACK !!! 308 if nbDevices > 0 and use_generic: 282 309 forms.append( GenericMixer( devmgr.bus, server ) ) 283 forms[ 0].show()310 forms[-1].show() 284 311 285 312 if forms: 286 app.setMainWidget(forms[0]) 313 # not setting this makes that the app doesn't quit when the first window is closed 314 #app.setMainWidget(forms[0]) 287 315 288 316 QObject.connect(app,SIGNAL("lastWindowClosed()"),app,SLOT("quit()")) trunk/libffado/support/mixer/SConscript
r994 r1060 32 32 e['MIXERAPPS'] = [ 'phase24', 'phase88', 'saffirepro', 'saffire', 33 33 'saffirele', 'af2', 'bcoaudio5', 'edirolfa66', 34 'mackie_generic', 'quatafire', 'motu', 'generic' ] 34 'mackie_generic', 'quatafire', 'motu', 35 'generic', 'dummy' 36 ] 37 e['OTHERAPPS'] = ['ffado_regdialog'] 38 35 39 # 36 40 # For the ffadomixer.in … … 46 50 e.Install( "$pythondir", app+".py" ) 47 51 52 for app in e['OTHERAPPS']: 53 if os.path.exists( app+".ui" ): 54 e.PyUIC( source=app+".ui", target=app+"ui.py" ) 55 e.Install( "$pythondir", app+"ui.py" ) 56 e.Install( "$pythondir", app+".py" ) 57 58 e.ScanReplace( "ffadomixer_config.py.in" ) 59 e.Depends( "ffadomixer_config.py", "#/SConstruct" ) 60 e.Install( "$pythondir", "ffadomixer_config.py" ) 61 48 62 e.ScanReplace( "ffadomixer.in" ) 63 e.Depends( "ffadomixer", "#/SConstruct" ) 49 64 e.Depends( "ffadomixer", "SConscript" ) 50 65 e.Install( "$bindir", "ffadomixer" )