Index: /trunk/libffado/src/libcontrol/ClockSelect.cpp
===================================================================
--- /trunk/libffado/src/libcontrol/ClockSelect.cpp (revision 1158)
+++ /trunk/libffado/src/libcontrol/ClockSelect.cpp (revision 1173)
@@ -40,4 +40,6 @@
ClockSelect::select(int idx)
{
+ m_Device.setVerboseLevel(DEBUG_LEVEL_VERY_VERBOSE);
+ debugOutput(DEBUG_LEVEL_VERBOSE, "Selecting clock idx: %d\n", idx);
FFADODevice::ClockSourceVector v = m_Device.getSupportedClockSources();
if(idx >= (int)v.size()) {
@@ -49,4 +51,5 @@
return false;
}
+ debugOutput(DEBUG_LEVEL_VERBOSE, " clock id: %d\n", v.at(idx).id);
return true;
}
@@ -55,4 +58,6 @@
ClockSelect::selected()
{
+ m_Device.setVerboseLevel(DEBUG_LEVEL_VERY_VERBOSE);
+ debugOutput(DEBUG_LEVEL_VERBOSE, "Finding active clock\n");
FFADODevice::ClockSourceVector v = m_Device.getSupportedClockSources();
FFADODevice::ClockSource active = m_Device.getActiveClockSource();
@@ -60,5 +65,6 @@
for (i=0; i < (int)v.size(); i++) {
FFADODevice::ClockSource c = v.at(i);
- if(c == active) {
+ if(c.id == active.id) {
+ debugOutput(DEBUG_LEVEL_VERBOSE, " Active clock at %d, id %d\n", i, c.id);
return i;
}
Index: /trunk/libffado/src/bebob/bebob_avdevice.cpp
===================================================================
--- /trunk/libffado/src/bebob/bebob_avdevice.cpp (revision 1156)
+++ /trunk/libffado/src/bebob/bebob_avdevice.cpp (revision 1173)
@@ -228,5 +228,5 @@
fbCmd.setSubunitId( 0x00 );
fbCmd.setCommandType( AVCCommand::eCT_Status );
- fbCmd.m_pFBSelector->m_inputFbPlugNumber=0;
+ fbCmd.m_pFBSelector->m_inputFbPlugNumber = 0xFF;
fbCmd.setVerboseLevel( getDebugLevel() );
Index: /trunk/libffado/src/bebob/terratec/terratec_device.cpp
===================================================================
--- /trunk/libffado/src/bebob/terratec/terratec_device.cpp (revision 1156)
+++ /trunk/libffado/src/bebob/terratec/terratec_device.cpp (revision 1173)
@@ -76,4 +76,9 @@
int fb_syncsource_value = getSelectorFBValue(9);
+ debugOutput(DEBUG_LEVEL_VERBOSE,
+ "Selectors: 0x%02X 0x%02X\n",
+ fb_extsync_value, fb_syncsource_value);
+
+
if(fb_syncsource_value == 0) {
return m_internal_clocksource;
@@ -95,5 +100,5 @@
bool retval = true;
retval &= setSelectorFBValue(8, 0);
- retval &= setSelectorFBValue(9, 0);
+ retval &= setSelectorFBValue(9, 1);
return retval;
}
@@ -101,5 +106,5 @@
bool retval = true;
retval &= setSelectorFBValue(8, 1);
- retval &= setSelectorFBValue(9, 0);
+ retval &= setSelectorFBValue(9, 1);
return retval;
}
Index: /trunk/libffado/support/mixer/ffadomixer.in
===================================================================
--- /trunk/libffado/support/mixer/ffadomixer.in (revision 1166)
+++ /trunk/libffado/support/mixer/ffadomixer.in (revision 1173)
@@ -290,5 +290,5 @@
if nbDevices == 0:
print "No supported device found..."
- msg.information( msg, "No mixer found", "Your device doesn't seem to have a supported mixer." )
+ msg.information( msg, "No mixer found", "No devices with mixer support discovered." )
sys.exit( -1 )
Index: /trunk/libffado/support/dbus/controlserver.cpp
===================================================================
--- /trunk/libffado/support/dbus/controlserver.cpp (revision 1163)
+++ /trunk/libffado/support/dbus/controlserver.cpp (revision 1173)
@@ -52,8 +52,14 @@
}
-void Element::setVerboseLevel(int i)
+void Element::setVerboseLevel( const DBus::Int32 &i)
{
setDebugLevel(i);
+ m_Slave.setVerboseLevel(i);
if(m_UpdateLock) m_UpdateLock->setVerboseLevel(i);
+}
+
+DBus::Int32 Element::getVerboseLevel()
+{
+ return getDebugLevel();
}
@@ -158,6 +164,7 @@
void
-Container::setVerboseLevel(int i)
-{
+Container::setVerboseLevel( const DBus::Int32 & i)
+{
+ Element::setVerboseLevel(i);
for ( ElementVectorIterator it = m_Children.begin();
it != m_Children.end();
Index: /trunk/libffado/support/dbus/control-interface.xml
===================================================================
--- /trunk/libffado/support/dbus/control-interface.xml (revision 1163)
+++ /trunk/libffado/support/dbus/control-interface.xml (revision 1173)
@@ -15,4 +15,10 @@
+
+
+
+
+
+
Index: /trunk/libffado/support/dbus/controlserver.h
===================================================================
--- /trunk/libffado/support/dbus/controlserver.h (revision 1163)
+++ /trunk/libffado/support/dbus/controlserver.h (revision 1173)
@@ -86,5 +86,6 @@
DBus::String getDescription( );
- void setVerboseLevel(int i);
+ void setVerboseLevel( const DBus::Int32 &);
+ DBus::Int32 getVerboseLevel();
protected:
@@ -118,5 +119,5 @@
void updated(int new_nb_elements);
- void setVerboseLevel(int i);
+ void setVerboseLevel( const DBus::Int32 &);
private:
Element *createHandler(Element *, Control::Element& e);