Changeset 1601

Show
Ignore:
Timestamp:
07/20/09 06:19:31 (14 years ago)
Author:
jwoithe
Message:

RME: implement mixer skeleton to allow device configuration functionality to be tested. Note that none of the included controls are functional yet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/configuration

    r1548 r1601  
    298298    modelname = "FireFace800"; 
    299299    driver = 40; 
     300    mixer = "RmeMixer"; 
    300301}, 
    301302{ 
    …… 
    308309    modelname = "FireFace400"; 
    309310    driver = 40; 
     311    mixer = "RmeMixer"; 
    310312}, 
    311313{ 

  • trunk/libffado/support/mixer-qt4/ffado-mixer.in

    r1501 r1601  
    162162    logging.getLogger('edirolfa66').setLevel(debug_level) 
    163163    logging.getLogger('motu').setLevel(debug_level) 
     164    logging.getLogger('rme').setLevel(debug_level) 
    164165    logging.getLogger('phase24').setLevel(debug_level) 
    165166    logging.getLogger('phase88').setLevel(debug_level) 

  • trunk/libffado/support/mixer-qt4/ffado_panelmanager.py

    r1501 r1601  
    4646from mixer_quatafire import * 
    4747from mixer_motu import * 
     48from mixer_rme import * 
    4849from mixer_dummy import * 
    4950from mixer_global import GlobalMixer 
    …… 
    288289            if vendorId == 0x1f2: 
    289290                modelId = 0x00000000 
     291 
     292            # The RME devices use unitVersion to differentiate models.  
     293            # Therefore in the configuration file we use the config file's 
     294            # modelid field to store the unit version.  As a result we must 
     295            # override the modelId with the unit version here so the correct 
     296            # configuration file entry (and hense mixer widget) is identified. 
     297            if vendorId == 0xa35: 
     298                modelId = unitVersion; 
    290299 
    291300            dev = self.devices.getDeviceById( vendorId, modelId ) 

  • trunk/libffado/support/mixer-qt4/SConscript

    r1492 r1601  
    4141                        'mackie_onyxmixer', 
    4242                        'motu', 
     43                        'rme', 
    4344                        'global', 'dummy' 
    4445                     ] 
    …… 
    5455                        'mackie_onyxmixer', 
    5556                        'motu', 
     57                        'rme', 
    5658                        'global', 'dummy' 
    5759                     ]