Changeset 644

Timestamp:

10/14/07 10:19:22 (15 years ago)

Author:

ppalmers

Message:

- Adapt the phase 88 mixer control application to the new DBUS control interface

Files:

• trunk/libffado/src/bebob/bebob_mixer.cpp (modified) (9 diffs)
• trunk/libffado/src/ffadodevice.cpp (modified) (1 diff)
• trunk/libffado/src/libavc/general/avc_generic.h (modified) (1 diff)
• trunk/libffado/src/libieee1394/configrom.cpp (modified) (3 diffs)
• trunk/libffado/src/libieee1394/configrom.h (modified) (4 diffs)
• trunk/libffado/support/mixer/mixer_phase88.py (modified) (1 diff)
• trunk/libffado/support/mixer/mixer_phase88.ui (modified) (2 diffs)
• trunk/libffado/support/mixer/mixer_phase88.ui.h (modified) (1 diff)
• trunk/libffado/tests/control-interface.xml (modified) (1 diff)
• trunk/libffado/tests/controlserver.cpp (modified) (5 diffs)
• trunk/libffado/tests/controlserver.h (modified) (3 diffs)

trunk/libffado/src/bebob/bebob_mixer.cpp

@@ -219 +219 @@
-    fbCmd.m_pFBFeature->m_controlSelector=FunctionBlockFeature::eCSE_Feature_Volume;
-    fbCmd.m_pFBFeature->m_pVolume->m_volume=volume;
+    fbCmd.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
-
-    if ( !fbCmd.fire() ) {
@@ -225 +226 @@
-    }
-
-
-
-
-
+// 
+// 
+// 
+// 
-    
-    if((fbCmd.getResponse() != AVCCommand::eR_Accepted)) {
@@ -253 +254 @@
-    fbCmd.m_pFBFeature->m_controlSelector=FunctionBlockFeature::eCSE_Feature_Volume; // FIXME
-    fbCmd.m_pFBFeature->m_pVolume->m_volume=0;
+    fbCmd.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
-
-    if ( !fbCmd.fire() ) {
@@ -259 +261 @@
-    }
-    
-
-
-
-
+// 
+// 
+// 
+// 
-
-    if((fbCmd.getResponse() != AVCCommand::eR_Implemented)) {
@@ -268 +270 @@
-    }
-    
- volume=(in
+16_t volume=(int16_
-    
-    return volume;
@@ -308 +310 @@
-    fbCmd.setCommandType( AVCCommand::eCT_Control );
-    fbCmd.m_pFBSelector->m_inputFbPlugNumber=(v & 0xFF);
+    fbCmd.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
-
-    if ( !fbCmd.fire() ) {
@@ -314 +317 @@
-    }
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
-    if((fbCmd.getResponse() != AVCCommand::eR_Accepted)) {
-        debugWarning("fbCmd.getResponse() != AVCCommand::eR_Accepted\n");
@@ -340 +343 @@
-    fbCmd.setCommandType( AVCCommand::eCT_Status );
-    fbCmd.m_pFBSelector->m_inputFbPlugNumber=0;
+    fbCmd.setVerboseLevel( DEBUG_LEVEL_VERY_VERBOSE );
-
-    if ( !fbCmd.fire() ) {
@@ -346 +350 @@
-    }
-    
-
-
-
-
+// 
+// 
+// 
+// 
-
-    if((fbCmd.getResponse() != AVCCommand::eR_Implemented)) {

trunk/libffado/src/ffadodevice.cpp

@@ -45 +45 @@
-    std::ostringstream nodestr;
-    nodestr << "node" << getConfigRom().getNodeId();
-
-
-//     ConfigRom& c = getConfigRom(
-
+
+
+        debugWarning("failed to add ConfigRom to Control::Container\n"
+
-}
-

trunk/libffado/src/libavc/general/avc_generic.h

@@ -103 +103 @@
-
-    bool setVerbose( int verboseLevel );
+    bool setVerboseLevel( int verboseLevel )
+        { return setVerbose(verboseLevel);};
+
-    int getVerboseLevel();
-

trunk/libffado/src/libieee1394/configrom.cpp

@@ -61 +61 @@
-
-ConfigRom::ConfigRom( Ieee1394Service& ieee1394service, fb_nodeid_t nodeId )
-OscNode
+Control::Element
-    , m_1394Service( &ieee1394service )
-    , m_nodeId( nodeId )
@@ -88 +88 @@
-
-ConfigRom::ConfigRom()
-OscNode
+Control::Element
-    , m_1394Service( 0 )
-    , m_nodeId( -1 )
@@ -596 +596 @@
-    return true;
-}
-
-OSC::OscResponse
-ConfigRom::processOscMessage(OSC::OscMessage *m) {
-    OSC::OscResponse r=OSC::OscResponse(OSC::OscResponse::eUnhandled);
-
-    unsigned int nbArgs=m->nbArguments();
-    if (nbArgs>=1) {
-        OSC::OscArgument arg0=m->getArgument(0);
-        if(arg0.isString()) { // commands
-            string cmd=arg0.getString();
-
-            debugOutput( DEBUG_LEVEL_VERBOSE, "(%p) CMD? %s\n", this, cmd.c_str());
-            if(cmd == "params") {
-                debugOutput( DEBUG_LEVEL_VERBOSE, "Listing node params...\n");
-                OSC::OscMessage& rm=r.getMessage();
-                rm.addArgument("GUID");
-                rm.addArgument("VendorName");
-                rm.addArgument("ModelName");
-                r.setType(OSC::OscResponse::eMessage);
-            }
-            if(cmd == "get") {
-                if(nbArgs != 2) {
-                    debugError("Erronous get command received, wrong nb of arguments\n");
-                    m->print();
-                } else {
-                    OSC::OscArgument arg1=m->getArgument(1);
-                    if(arg1.isString()) { // commands
-                        string target=arg1.getString();
-                        OSC::OscMessage& rm=r.getMessage();
-                        if(target == "GUID") {
-                            // FIXME: this will only return the lower 32 bits
-                            rm.addArgument((int64_t)getGuid());
-                        } else if(target == "VendorName") {
-                            rm.addArgument(getVendorName());
-                        } else if(target == "ModelName") {
-                            rm.addArgument(getModelName());
-                        } else {
-                            debugError("Erronous get command received, non-existant target\n");
-                            m->print();
-                        }
-                        r.setType(OSC::OscResponse::eMessage);
-                    } else {
-                        debugError("Erronous get command received, wrong argument type\n");
-                        m->print();
-                    }
-                }
-            }
-        }
-    }
-
-    return r;
-
-}

trunk/libffado/src/libieee1394/configrom.h

@@ -33 +33 @@
-#include "debugmodule/debugmodule.h"
-
-osc/OscNode
+control/Element
-
-#include <string>
@@ -40 +40 @@
-
-class ConfigRom
-OSC::OscNode
+Control::Element
-{
- public:
@@ -57 +57 @@
-
-    const unsigned int getModelId() const;
+    // FIXME: isn't this the same as getNodeVendorId?
-    const unsigned int getVendorId() const;
-    const unsigned int getUnitSpecifierId() const;
@@ -136 +137 @@
-    struct csr1212_csr*    m_csr;
-
-protected: // OSC handling
-    OSC::OscResponse processOscMessage(OSC::OscMessage *m);
-
-private:
-    ConfigRom( const ConfigRom& ); // do not allow copy ctor

trunk/libffado/support/mixer/mixer_phase88.py

@@ -5 +5 @@
-from mixer_phase88ui import *
-import sys
+
+SupportedDevices=[
+    [(0x000aac, 0x00000003),'Phase88Control'],
+    ]
+
+class ControlInterface:
+    def __init__(self, servername, basepath):
+        self.basepath=basepath
+        self.servername=servername
+        self.bus=dbus.SessionBus()
+            
+    def setContignuous(self, subpath, v):
+        path = self.basepath + subpath
+        dev = self.bus.get_object(self.servername, path)
+        dev_cont = dbus.Interface(dev, dbus_interface='org.ffado.Control.Element.Continuous')
+        dev_cont.setValue(v)
+           
+    def getContignuous(self, subpath):
+        path = self.basepath + subpath
+        dev = self.bus.get_object(self.servername, path)
+        dev_cont = dbus.Interface(dev, dbus_interface='org.ffado.Control.Element.Continuous')
+        return dev_cont.getValue()        
+    
+    def setDiscrete(self, subpath, v):
+        path = self.basepath + subpath
+        dev = self.bus.get_object(self.servername, path)
+        dev_cont = dbus.Interface(dev, dbus_interface='org.ffado.Control.Element.Discrete')
+        dev_cont.setValue(v)
+           
+    def getDiscrete(self, subpath):
+        path = self.basepath + subpath
+        dev = self.bus.get_object(self.servername, path)
+        dev_cont = dbus.Interface(dev, dbus_interface='org.ffado.Control.Element.Discrete')
+        return dev_cont.getValue()        
+
+class DeviceManagerInterface:
+    def __init__(self, servername, basepath):
+        self.basepath=basepath + '/DeviceManager'
+        self.servername=servername
+        self.bus=dbus.SessionBus()
+        self.dev = self.bus.get_object(self.servername, self.basepath)
+        self.iface = dbus.Interface(self.dev, dbus_interface='org.ffado.Control.Element.Container')
+            
+    def getNbDevices(self):
+        return self.iface.getNbElements()
+    def getDeviceName(self, idx):
+        return self.iface.getElementName(idx)  
+
+class ConfigRomInterface:
+    def __init__(self, servername, devicepath):
+        self.basepath=devicepath + '/ConfigRom'
+        self.servername=servername
+        self.bus=dbus.SessionBus()
+        self.dev = self.bus.get_object(self.servername, self.basepath)
+        self.iface = dbus.Interface(self.dev, dbus_interface='org.ffado.Control.Element.ConfigRomX')
+    def getGUID(self):
+        return self.iface.getGUID()
+    def getVendorName(self):
+        return self.iface.getVendorName()
+    def getModelName(self):
+        return self.iface.getModelName()
+    def getVendorId(self):
+        return self.iface.getVendorId()
+    def getModelId(self):
+        return self.iface.getModelId()
+   
+
-if __name__ == "__main__":
+    
+    server='org.ffado.Control'
+    basepath='/org/ffado/Control'
+    
-    app = QApplication(sys.argv)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    app.setMainWidget(f)
-    app.exec_loop()

trunk/libffado/support/mixer/mixer_phase88.ui

@@ -2 +2 @@
-<class>Phase88Control</class>
-<comment>Python:
-OSC
-osc
+DBUS
+dbus
-</comment>
-<widget class="QDialog">
@@ -707 +707 @@
-    <slot>setVolumeWavePlay( int )</slot>
-    <slot>setVolumeMaster( int )</slot>
+    <slot>setVolume( QString, int )</slot>
+    <slot>init()</slot>
+    <slot>initValues()</slot>
+    <slot>setSelector(QString, int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>

trunk/libffado/support/mixer/mixer_phase88.ui.h

@@ -11 +11 @@
-*****************************************************************************/
-
-
-void Phase88Control::switchFrontState( int )
-{
-
-
-
-
-
-
-
-
-
+
-}
-
-void Phase88Control::switchOutAssign( int )
-{
-
-
+
-}
-
-void Phase88Control::switchWaveInAssign( int )
-{
-
-
+
-}
-
-void Phase88Control::switchSyncSource( int )
-{
-
-
+
-}
-
-void Phase88Control::switchExtSyncSource( int )
-{
-
-
+
-}
-
-void Phase88Control::setVolume12( int )
-{
-
-
-
+
-}
-
-void Phase88Control::setVolume34( int )
-{
-
-
-
+
-}
-
-void Phase88Control::setVolume56( int )
-{
-
-
-
+
-}
-
-void Phase88Control::setVolume78( int )
-{
-
-
-
+
-}
-
-void Phase88Control::setVolumeSPDIF( int )
-{
-
-
-
+
-}
-
-void Phase88Control::setVolumeWavePlay( int )
-{
-
-
-
+
-}
-
-void Phase88Control::setVolumeMaster( int )
-{
-
-
-
+
-}
+
+void Phase88Control::setVolume( QString, int )
+{
+    name=a0
+    vol = -a1
+    
+    print "setting %s volume to %d" % (name, vol)
+    self.hw.setContignuous(self.VolumeControls[name][0], vol)
+}
+
+void Phase88Control::setSelector( QString, int )
+{
+    name=a0
+    state = a1
+    
+    print "setting %s state to %d" % (name, state)
+    self.hw.setDiscrete(self.SelectorControls[name][0], state)
+}
+
+void Phase88Control::init()
+{
+    print "Init Phase88 mixer window"
+
+    self.VolumeControls={
+        'master':    ['/Mixer/Feature_1', self.sldInputMaster], 
+        'line12' :   ['/Mixer/Feature_2', self.sldInput12],
+        'line34' :   ['/Mixer/Feature_3', self.sldInput34],
+        'line56' :   ['/Mixer/Feature_4', self.sldInput56],
+        'line78' :   ['/Mixer/Feature_5', self.sldInput78],
+        'spdif' :    ['/Mixer/Feature_6', self.sldInputSPDIF],
+        'waveplay' : ['/Mixer/Feature_7', self.sldInputWavePlay],
+        }
+
+    self.SelectorControls={
+        'outassign':    ['/Mixer/Selector_6', self.comboOutAssign], 
+        'inassign':     ['/Mixer/Selector_7', self.comboInAssign], 
+        'externalsync': ['/Mixer/Selector_8', self.comboExtSync], 
+        'syncsource':   ['/Mixer/Selector_9', self.comboSyncSource], 
+        'frontback':    ['/Mixer/Selector_10', self.comboFrontBack], 
+    }
+}
+
+void Phase88Control::initValues()
+{
+    for name, ctrl in self.VolumeControls.iteritems():
+        vol = self.hw.getContignuous(ctrl[0])
+        print "%s volume is %d" % (name , vol)
+        ctrl[1].setValue(-vol)
+
+    for name, ctrl in self.SelectorControls.iteritems():
+        state = self.hw.getDiscrete(ctrl[0])
+        print "%s state is %d" % (name , state)
+        ctrl[1].setCurrentItem(state)    
+}

trunk/libffado/tests/control-interface.xml

@@ -16 +16 @@
-      </method>
-  </interface>
-
+
-  <interface name="org.ffado.Control.Element.Container">
+      <method name="getNbElements">
+          <arg type="i" name="count" direction="out"/>
+      </method>
+      <method name="getElementName">
+          <arg type="i" name="id" direction="in"/>
+          <arg type="s" name="name" direction="out"/>
+      </method>
-  </interface>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  <interface name="org.ffado.Control.Element.Continuous">
-      <method name="setValue">

trunk/libffado/tests/controlserver.cpp

@@ -96 +96 @@
-}
-
+DBus::Int32
+Container::getNbElements( ) {
+    return m_Slave.countElements();
+}
+
+DBus::String
+Container::getElementName( const DBus::Int32& i ) {
+    int nbElements=m_Slave.countElements();
+    if (i<nbElements) {
+        return m_Slave.getElements().at(i)->getName();
+    } else return "";
+}
+
+
-/**
- * \brief create a correct DBusControl counterpart for a given Control::Element
@@ -125 +139 @@
-    }
-    
+    if (dynamic_cast<ConfigRom *>(&e) != NULL) {
+        debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a ConfigRom\n");
+        
+        return new ConfigRomX(conn(), std::string(path()+"/"+e.getName()),
+            *dynamic_cast<ConfigRom *>(&e));
+    }
+    
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Source is a Control::Element\n");
-    return new Element(conn(), std::string(path()+"/"+e.getName()), e);
@@ -143 +164 @@
-{
-    m_Slave.setValue(value);
+/*    
+    usleep(1000*500);
+    
-    debugOutput( DEBUG_LEVEL_VERBOSE, "setValue(%lf) => %lf\n", value, m_Slave.getValue() );
-    
-
+
+
-}
-
@@ -169 +194 @@
-{
-    m_Slave.setValue(value);
+    
+/*    usleep(1000*500);
-    debugOutput( DEBUG_LEVEL_VERBOSE, "setValue(%d) => %d\n", value, m_Slave.getValue() );
-    
-
+
+
-}
-
@@ -181 +209 @@
-}
-
+// --- ConfigRom
+
+ConfigRomX::ConfigRomX( DBus::Connection& connection, std::string p, ConfigRom &slave)
+: Element(connection, p, slave)
+, m_Slave(slave)
+{
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Created ConfigRomX on '%s'\n",
+                 path().c_str() );
+}
+
+DBus::String
+ConfigRomX::getGUID( )
+{
+    return m_Slave.getGuidString();
+}
+
+DBus::String
+ConfigRomX::getVendorName( )
+{
+    return m_Slave.getVendorName();
+}
+
+DBus::String
+ConfigRomX::getModelName( )
+{
+    return m_Slave.getModelName();
+}
+
+DBus::Int32
+ConfigRomX::getVendorId( )
+{
+    return m_Slave.getNodeVendorId();
+}
+
+DBus::Int32
+ConfigRomX::getModelId( )
+{
+    return m_Slave.getModelId();
+}
+
-} // end of namespace Control

trunk/libffado/tests/controlserver.h

@@ -33 +33 @@
-
-#include "libcontrol/BasicElements.h"
+#include "libieee1394/configrom.h"
-
-namespace DBusControl {
@@ -73 +74 @@
-    
-    Element *createHandler(Control::Element& e);
+
+    DBus::Int32 getNbElements( );
+    DBus::String getElementName( const DBus::Int32& );
+
-private:
-    Control::Container &m_Slave;
@@ -110 +115 @@
-};
-
+// FIXME: to change this to a normal ConfigRom class name we have to
+// put the 1394 config rom class into a separate namespace.
+class ConfigRomX
+: public org::ffado::Control::Element::ConfigRomX
+, public Element
+{
+public:
+    ConfigRomX( DBus::Connection& connection,
+                  std::string p,
+                  ConfigRom &slave );
+
+    DBus::String getGUID( );
+    DBus::String getVendorName( );
+    DBus::String getModelName( );
+    DBus::Int32 getVendorId( );
+    DBus::Int32 getModelId( );
+
+private:
+    ConfigRom &m_Slave;
+};
+
-
-}