Changeset 1691

Show
Ignore:
Timestamp:
10/17/09 11:14:32 (11 years ago)
Author:
arnonym
Message:

Only load the mixerwidgets that are actually needed.

To automate this, a rules are imposed:

The filename has to be the lower-case variant of the mixer name

This should speed up loading time of ffado-mixer. Please everybody test this and report any errors as I don't have all the devices to test everything fully.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/support/mixer-qt4/ffado/mixer/audiofire.py

    r1640 r1691  
    3939        uicLoad("ffado/mixer/audiofire_settings", self) 
    4040 
    41 class AudioFireMixer(QWidget): 
     41class AudioFire(QWidget): 
    4242    def __init__(self,parent = None): 
    4343        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/dummy.py

    r1640 r1691  
    2525from ffado.config import * 
    2626 
    27 class DummyMixer(QWidget): 
     27class Dummy(QWidget): 
    2828    def __init__(self,parent = None): 
    2929        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/mackie_onyxmixer.py

    r1640 r1691  
    2525from ffado.config import * 
    2626 
    27 class MackieOnyxMixer(QWidget): 
     27class MackieOnyx(QWidget): 
    2828    def __init__(self,parent = None): 
    2929        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/motu.py

    r1640 r1691  
    3838MOTU_MODEL_896HD    = 0x0006 
    3939 
    40 class MotuMixer(QWidget): 
     40class Motu(QWidget): 
    4141    def __init__(self,parent = None): 
    4242        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/nodevice.py

    r1640 r1691  
    2626from mixer_nodeviceui import Ui_NoDeviceMixerUI 
    2727 
    28 class NoDeviceMixer(QWidget, Ui_NoDeviceMixerUI): 
     28class NoDevice(QWidget, Ui_NoDeviceMixerUI): 
    2929    def __init__(self,parent = None): 
    3030        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/quatafire.py

    r1640 r1691  
    2828log = logging.getLogger('quatafire') 
    2929 
    30 class QuataFireMixer(QWidget): 
     30class QuataFire(QWidget): 
    3131    def __init__(self,parent = None): 
    3232        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/rme.py

    r1640 r1691  
    3333RME_MODEL_FF400     = 0x0002 
    3434 
    35 class RmeMixer(QWidget): 
     35class Rme(QWidget): 
    3636    def __init__(self,parent = None): 
    3737        QWidget.__init__(self,parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/saffire.py

    r1640 r1691  
    5050#Fx: reverb/fx return 
    5151 
    52 class SaffireMixer(QWidget): 
     52class Saffire(QWidget): 
    5353    def __init__(self,parent = None): 
    5454        QWidget.__init__(self, parent) 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/saffirepro.py

    r1640 r1691  
    2828log = logging.getLogger('saffirepro') 
    2929 
    30 class SaffireProMixer(QWidget): 
     30class SaffirePro(QWidget): 
    3131    def __init__(self,parent = None): 
    3232        QWidget.__init__(self, parent) 
  • trunk/libffado/support/mixer-qt4/ffado/panelmanager.py

    r1640 r1691  
    3333from ffado.configuration import * 
    3434 
    35 from ffado.mixer.phase88 import * 
    36 from ffado.mixer.phase24 import * 
    37 from ffado.mixer.saffire import SaffireMixer 
    38 from ffado.mixer.saffirepro import SaffireProMixer 
    39 from ffado.mixer.saffire_dice import Saffire_Dice 
    40 from ffado.mixer.audiofire import AudioFireMixer 
    41 from ffado.mixer.bcoaudio5 import * 
    42 from ffado.mixer.edirolfa66 import * 
    43 from ffado.mixer.edirolfa101 import * 
    44 from ffado.mixer.mackie_onyxmixer import * 
    45 from ffado.mixer.quatafire import * 
    46 from ffado.mixer.motu import * 
    47 from ffado.mixer.rme import * 
    48 from ffado.mixer.dummy import * 
    4935from ffado.mixer.globalmixer import GlobalMixer 
    5036 
     
    332318            if 'mixer' in dev and dev['mixer'] != None: 
    333319                mixerapp = dev['mixer'] 
    334                 exec( "mixerwidget = "+mixerapp+"( w )" ) 
     320                exec( """ 
     321import ffado.mixer.%s 
     322mixerwidget = ffado.mixer.%s.%s( w ) 
     323""" % (mixerapp.lower(), mixerapp.lower(), mixerapp) ) 
    335324            else: 
    336325                mixerwidget = DummyMixer( w )