Changeset 973 for trunk/libffado/support/dbus
- Timestamp:
- 03/23/08 10:35:01 (16 years ago)
- Files:
-
- trunk/libffado/support/dbus/control-interface.xml (modified) (2 diffs)
- trunk/libffado/support/dbus/controlserver.cpp (modified) (2 diffs)
- trunk/libffado/support/dbus/controlserver.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/libffado/support/dbus/control-interface.xml
r965 r973 53 53 <arg type="d" name="value" direction="out"/> 54 54 </method> 55 <method name="setValueIdx"> 56 <arg type="i" name="idx" direction="in"/> 57 <arg type="d" name="value" direction="in"/> 58 <arg type="d" name="value" direction="out"/> 59 </method> 60 <method name="getValueIdx"> 61 <arg type="i" name="idx" direction="in"/> 62 <arg type="d" name="value" direction="out"/> 63 </method> 55 64 </interface> 56 65 … … 61 70 </method> 62 71 <method name="getValue"> 72 <arg type="i" name="value" direction="out"/> 73 </method> 74 <method name="setValueIdx"> 75 <arg type="i" name="idx" direction="in"/> 76 <arg type="i" name="value" direction="in"/> 77 <arg type="i" name="value" direction="out"/> 78 </method> 79 <method name="getValueIdx"> 80 <arg type="i" name="idx" direction="in"/> 63 81 <arg type="i" name="value" direction="out"/> 64 82 </method> trunk/libffado/support/dbus/controlserver.cpp
r965 r973 219 219 } 220 220 221 DBus::Double 222 Continuous::setValueIdx( const DBus::Int32 & idx, const DBus::Double& value ) 223 { 224 m_Slave.setValue(idx, value); 225 /* 226 SleepRelativeUsec(1000*500); 227 228 debugOutput( DEBUG_LEVEL_VERBOSE, "setValue(%lf) => %lf\n", value, m_Slave.getValue() ); 229 230 return m_Slave.getValue();*/ 231 return value; 232 } 233 234 DBus::Double 235 Continuous::getValueIdx( const DBus::Int32 & idx ) 236 { 237 double val = m_Slave.getValue(idx); 238 debugOutput( DEBUG_LEVEL_VERBOSE, "getValue(%d) => %lf\n", idx, val ); 239 return val; 240 } 241 221 242 // --- Discrete 222 243 … … 249 270 } 250 271 272 DBus::Int32 273 Discrete::setValueIdx( const DBus::Int32& idx, const DBus::Int32& value ) 274 { 275 m_Slave.setValue(idx, value); 276 277 /* SleepRelativeUsec(1000*500); 278 debugOutput( DEBUG_LEVEL_VERBOSE, "setValue(%d) => %d\n", value, m_Slave.getValue() ); 279 280 return m_Slave.getValue();*/ 281 return value; 282 } 283 284 DBus::Int32 285 Discrete::getValueIdx( const DBus::Int32& idx ) 286 { 287 int32_t val = m_Slave.getValue(idx); 288 debugOutput( DEBUG_LEVEL_VERBOSE, "getValue(%d) => %d\n", idx, val ); 289 return val; 290 } 291 251 292 // --- Text 252 293 trunk/libffado/support/dbus/controlserver.h
r965 r973 97 97 DBus::Double setValue( const DBus::Double & value ); 98 98 DBus::Double getValue( ); 99 DBus::Double setValueIdx( const DBus::Int32 & idx, 100 const DBus::Double & value ); 101 DBus::Double getValueIdx( const DBus::Int32 & idx ); 99 102 100 103 private: … … 113 116 DBus::Int32 setValue( const DBus::Int32 & value ); 114 117 DBus::Int32 getValue( ); 118 DBus::Int32 setValueIdx( const DBus::Int32 & idx, 119 const DBus::Int32 & value ); 120 DBus::Int32 getValueIdx( const DBus::Int32 & idx ); 115 121 116 122 private: