Changeset 1173

Show
Ignore:
Timestamp:
05/15/08 10:37:07 (13 years ago)
Author:
ppalmers
Message:

Fix issue with the AV/C function blocks not being set correctly. Fix clocksource selection bug. Expose control of verbose level through DBUS

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/src/bebob/bebob_avdevice.cpp

    r1156 r1173  
    228228    fbCmd.setSubunitId( 0x00 ); 
    229229    fbCmd.setCommandType( AVCCommand::eCT_Status ); 
    230     fbCmd.m_pFBSelector->m_inputFbPlugNumber=0; 
     230    fbCmd.m_pFBSelector->m_inputFbPlugNumber = 0xFF; 
    231231    fbCmd.setVerboseLevel( getDebugLevel() ); 
    232232 

  • trunk/libffado/src/bebob/terratec/terratec_device.cpp

    r1156 r1173  
    7676    int fb_syncsource_value = getSelectorFBValue(9); 
    7777 
     78    debugOutput(DEBUG_LEVEL_VERBOSE, 
     79                "Selectors: 0x%02X 0x%02X\n", 
     80                fb_extsync_value, fb_syncsource_value); 
     81 
     82 
    7883    if(fb_syncsource_value == 0) { 
    7984        return m_internal_clocksource; 
    …… 
    95100        bool retval = true; 
    96101        retval &= setSelectorFBValue(8, 0); 
    97         retval &= setSelectorFBValue(9, 0); 
     102        retval &= setSelectorFBValue(9, 1); 
    98103        return retval; 
    99104    } 
    …… 
    101106        bool retval = true; 
    102107        retval &= setSelectorFBValue(8, 1); 
    103         retval &= setSelectorFBValue(9, 0); 
     108        retval &= setSelectorFBValue(9, 1); 
    104109        return retval; 
    105110    } 

  • trunk/libffado/src/libcontrol/ClockSelect.cpp

    r1158 r1173  
    4040ClockSelect::select(int idx) 
    4141{ 
     42    m_Device.setVerboseLevel(DEBUG_LEVEL_VERY_VERBOSE); 
     43    debugOutput(DEBUG_LEVEL_VERBOSE, "Selecting clock idx: %d\n", idx); 
    4244    FFADODevice::ClockSourceVector v = m_Device.getSupportedClockSources(); 
    4345    if(idx >= (int)v.size()) { 
    …… 
    4951        return false; 
    5052    } 
     53    debugOutput(DEBUG_LEVEL_VERBOSE, " clock id: %d\n", v.at(idx).id); 
    5154    return true; 
    5255} 
    …… 
    5558ClockSelect::selected() 
    5659{ 
     60    m_Device.setVerboseLevel(DEBUG_LEVEL_VERY_VERBOSE); 
     61    debugOutput(DEBUG_LEVEL_VERBOSE, "Finding active clock\n"); 
    5762    FFADODevice::ClockSourceVector v = m_Device.getSupportedClockSources(); 
    5863    FFADODevice::ClockSource active = m_Device.getActiveClockSource(); 
    …… 
    6065    for (i=0; i < (int)v.size(); i++) { 
    6166        FFADODevice::ClockSource c = v.at(i); 
    62         if(c == active) { 
     67        if(c.id == active.id) { 
     68            debugOutput(DEBUG_LEVEL_VERBOSE, " Active clock at %d, id %d\n", i, c.id); 
    6369            return i; 
    6470        } 

  • trunk/libffado/support/dbus/control-interface.xml

    r1163 r1173  
    1515          <arg type="s" name="description" direction="out"/> 
    1616      </method> 
     17      <method name="getVerboseLevel"> 
     18          <arg type="i" name="level" direction="out"/> 
     19      </method> 
     20      <method name="setVerboseLevel"> 
     21          <arg type="i" name="level" direction="in"/> 
     22      </method> 
    1723  </interface> 
    1824 

  • trunk/libffado/support/dbus/controlserver.cpp

    r1163 r1173  
    5252} 
    5353 
    54 void Element::setVerboseLevel(int i) 
     54void Element::setVerboseLevel( const DBus::Int32 &i) 
    5555{ 
    5656    setDebugLevel(i); 
     57    m_Slave.setVerboseLevel(i); 
    5758    if(m_UpdateLock) m_UpdateLock->setVerboseLevel(i); 
     59} 
     60 
     61DBus::Int32 Element::getVerboseLevel() 
     62{ 
     63    return getDebugLevel(); 
    5864} 
    5965 
    …… 
    158164 
    159165void 
    160 Container::setVerboseLevel(int i) 
    161 { 
     166Container::setVerboseLevel( const DBus::Int32 & i) 
     167{ 
     168    Element::setVerboseLevel(i); 
    162169    for ( ElementVectorIterator it = m_Children.begin(); 
    163170      it != m_Children.end(); 

  • trunk/libffado/support/dbus/controlserver.h

    r1163 r1173  
    8686    DBus::String getDescription( ); 
    8787 
    88     void setVerboseLevel(int i); 
     88    void setVerboseLevel( const DBus::Int32 &); 
     89    DBus::Int32 getVerboseLevel(); 
    8990 
    9091protected: 
    …… 
    118119 
    119120    void updated(int new_nb_elements); 
    120     void setVerboseLevel(int i); 
     121    void setVerboseLevel( const DBus::Int32 &); 
    121122private: 
    122123    Element *createHandler(Element *, Control::Element& e); 

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

    r1166 r1173  
    290290    if nbDevices == 0: 
    291291        print "No supported device found..." 
    292         msg.information( msg, "No mixer found", "Your device doesn't seem to have a supported mixer." ) 
     292        msg.information( msg, "No mixer found", "No devices with mixer support discovered." ) 
    293293        sys.exit( -1 ) 
    294294