Changeset 801

Show
Ignore:
Timestamp:
01/02/08 12:00:52 (16 years ago)
Author:
arnonym
Message:

/me is very stupid.

But now the mixers should work and install just fine...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/support/mixer/ffadomixer.in

    r799 r801  
    2222# 
    2323 
     24import sys 
     25# Add the path of the installed ffado-mixer-modules 
     26sys.path.append( "$PYTHONDIR" ) 
     27 
     28import dbus 
    2429from qt import * 
     30 
    2531from mixer_phase88 import * 
    2632from mixer_phase24 import * 
    …… 
    2935from mixer_af2 import * 
    3036from mixer_bcoaudio5 import * 
    31 import sys 
    32 import dbus 
    3337 
    3438SupportedDevices=[ 

  • trunk/libffado/support/mixer/SConscript

    r800 r801  
    2929        e = env.Clone() 
    3030 
    31         e['MIXERAPPS'] = [ 'phase24', 'phase88', 'saffirepro', 'saffire', 'af2', 'bcoaudio5', 'aktest' ] 
     31        e['MIXERAPPS'] = [ 'phase24', 'phase88', 'saffirepro', 'saffire', 'af2', 'bcoaudio5' ] 
    3232        e['PYTHONDIR'] = Template( os.path.join( e['SHAREDIR'], 'python' ) ).safe_substitute( e ) 
    3333 
    34         apps = [] 
    35  
    3634        for m in e['MIXERAPPS']: 
    37                 apps.append( "mixer_" + m ) 
    38  
    39         for app in apps: 
     35                app = "mixer_" + m 
    4036                if os.path.exists( app+".ui" ): 
    4137                        e.PyUIC( source=app+".ui", target=app+"ui.py" ) 
    …… 
    4440                e.Install( "$PYTHONDIR", app+".py" ) 
    4541 
    46         #e.ScanReplace( "ffadomixer.in" ) 
    47         #e.Depends( "ffadomixer", "SConscript" ) 
    48         #e.Install( "$bindir", "ffadomixer" ) 
     42        e.ScanReplace( "ffadomixer.in" ) 
     43        e.Depends( "ffadomixer", "SConscript" ) 
     44        e.Install( "$bindir", "ffadomixer" ) 
    4945 
    50         #for app in apps: 
    51         #       e.InstallAs( os.path.join( e['bindir'], "ffado"+app ), "ffadomixer" ) 
    52