Changeset 1296

Show
Ignore:
Timestamp:
07/13/08 15:34:20 (13 years ago)
Author:
ppalmers
Message:

small adapt to new samplerate selection mechanism

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/support/mixer/ffadomixer.in

    r1288 r1296  
    406406        # create a control object 
    407407        hw = ControlInterface(server, basepath+'/DeviceManager/'+path) 
     408        clockselect = ClockSelectInterface( server, basepath+"/DeviceManager/"+path ) 
     409        samplerateselect = SamplerateSelectInterface( server, basepath+"/DeviceManager/"+path ) 
     410        nickname = TextInterface( server, basepath+"/DeviceManager/"+path+"/Generic/Nickname" ) 
    408411 
    409412        # 
     
    411414        # 
    412415        tmp = GlobalMixer( w ) 
    413         tmp.clockselect = ClockSelectInterface( server, basepath+"/DeviceManager/"+path ) 
    414         tmp.samplerateselect = SamplerateSelectInterface( server, basepath+"/DeviceManager/"+path ) 
    415         tmp.nickname = TextInterface( server, basepath+"/DeviceManager/"+path+"/Generic/Nickname" ) 
     416        tmp.configrom = cfgrom 
     417        tmp.clockselect = clockselect 
     418        tmp.samplerateselect = samplerateselect 
     419        tmp.nickname = nickname 
    416420        tmp.hw = hw 
    417421        tmp.initValues() 
     
    444448 
    445449                # different panel for different clock frequency 
    446                 samplerate = hw.getDiscrete('/Generic/SamplerateSelect') 
     450                selected = samplerateselect.selected() 
     451                samplerate = int(samplerateselect.getEnumLabel( selected )) 
    447452 
    448453                # adat on PRO26 makes a difference 
     
    490495        # 
    491496        l.addWidget( mixerwidget, 10 ) 
     497        mixerwidget.configrom = cfgrom 
     498        mixerwidget.clockselect = clockselect 
     499        mixerwidget.samplerateselect = samplerateselect 
     500        mixerwidget.nickname = nickname 
    492501        mixerwidget.hw = hw 
    493         mixerwidget.configrom = cfgrom 
    494         mixerwidget.clockselect = ClockSelectInterface(server, basepath+'/DeviceManager/'+path) 
    495502        if 'buildMixer' in dir(mixerwidget): 
    496503            mixerwidget.buildMixer()