Changeset 1426

Show
Ignore:
Timestamp:
11/10/08 03:40:56 (12 years ago)
Author:
jwoithe
Message:

MOTU: fix a typo in the previous mixer setup patch.
Configuration: Correctly parse hex numbers from the configuration file. Among other things, the motumixer should once again be shown for MOTU devices.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/libffado-2.0/src/motu/motu_avdevice.cpp

    r1425 r1426  
    516516    MotuMatrixMixer *solo_mmixer = NULL; 
    517517    MotuMatrixMixer *mute_mmixer = NULL; 
     518    const struct MatrixMixBus *buses = NULL; 
     519    const struct MatrixMixChannel *channels = NULL; 
    518520    unsigned int bus, ch, i; 
    519521 
     
    522524        result = false; 
    523525    } else { 
    524         const struct MatrixMixBus *buses = DevicesProperty[m_motu_model-1].mixer->mixer_buses; 
     526        buses = DevicesProperty[m_motu_model-1].mixer->mixer_buses; 
    525527        if (buses == NULL) { 
    526528            debugOutput(DEBUG_LEVEL_WARNING, "No buses defined for model %d\n", m_motu_model); 
    527529            result = false; 
    528530        } 
    529         const struct MatrixMixChannel *channels = DevicesProperty[m_motu_model-1].mixer->mixer_channels; 
     531        channels = DevicesProperty[m_motu_model-1].mixer->mixer_channels; 
    530532        if (channels == NULL) { 
    531533            debugOutput(DEBUG_LEVEL_WARNING, "No channels defined for model %d\n", m_motu_model); 
  • branches/libffado-2.0/support/mixer-qt4/ffado_configuration.py

    r1415 r1426  
    4646                                        key = p[0:p.find("=")] 
    4747                                        value = p[p.find("=")+1:] 
    48                                         if re.search( "[^0-9x]", value ) == None: # convert hex-numbers to int 
     48                                        if re.search( "^0x[0-9a-fA-F]*", value ) != None: # convert hex-numbers to int 
    4949                                                value = int( value, 16 )              # or should it be long? 
    5050                                        item[ key ] = value 
  • branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py

    r1416 r1426  
    268268 
    269269            # The MOTU devices use unitVersion to differentiate models.  For the 
    270             # moment thought we don't need to know precisely which model we're 
     270            # moment though we don't need to know precisely which model we're 
    271271            # using. 
    272272            if vendorId == 0x1f2: