Changeset 1655

Show
Ignore:
Timestamp:
09/05/09 05:07:54 (11 years ago)
Author:
arnonym
Message:

Thinking about getting structured info about the router-channels.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/dice/dice_avdevice.h

    r1651 r1655  
    311311            virtual NameVector getDestinationNames(); 
    312312 
     313            virtual Control::CrossbarRouter::Groups getSources(); 
     314            virtual Control::CrossbarRouter::Groups getDestinations(); 
     315 
    313316            virtual IntVector getDestinationsForSource(const int); 
    314317            virtual int getSourceForDestination(const int); 
  • trunk/libffado/src/dice/dice_eap.cpp

    r1653 r1655  
    12291229} 
    12301230 
     1231Control::CrossbarRouter::Groups 
     1232Device::EAP::Router::getSources() 
     1233{ 
     1234    debugError("Device::EAP::Router::getSources() is not yet implemented!"); 
     1235    return Control::CrossbarRouter::Groups(); 
     1236} 
     1237 
     1238Control::CrossbarRouter::Groups 
     1239Device::EAP::Router::getDestinations() 
     1240{ 
     1241    debugError("Device::EAP::Router::getDestinations() is not yet implemented!"); 
     1242    return Control::CrossbarRouter::Groups(); 
     1243} 
     1244 
    12311245Control::CrossbarRouter::IntVector 
    12321246Device::EAP::Router::getDestinationsForSource(const int srcid) 
  • trunk/libffado/src/libcontrol/CrossbarRouter.h

    r1653 r1655  
    5959    typedef std::vector<PeakValue> PeakValues; 
    6060 
     61    struct Group 
     62    { 
     63        std::string name; 
     64        int nbchannels; 
     65    }; 
     66    typedef std::vector<Group> Groups; 
     67 
    6168    virtual std::string getSourceName(const int) = 0; 
    6269    virtual std::string getDestinationName(const int) = 0; 
     
    6673    virtual NameVector getSourceNames() = 0; 
    6774    virtual NameVector getDestinationNames() = 0; 
     75 
     76    virtual Groups getSources() = 0; 
     77    virtual Groups getDestinations() = 0; 
    6878 
    6979    virtual IntVector getDestinationsForSource(const int) = 0; 
  • trunk/libffado/support/dbus/control-interface.xml

    r1652 r1655  
    224224      <method name="getSourceNames"> 
    225225          <arg type="as" name="sourcenames" direction="out"/> 
     226      </method> 
     227      <method name="getSources"> 
     228          <arg type="a(si)" name="sources" direction="out"/> 
     229      </method> 
     230      <method name="getDestinations"> 
     231          <arg type="a(si)" name="sources" direction="out"/> 
    226232      </method> 
    227233      <method name="getDestinationNames"> 
  • trunk/libffado/support/dbus/controlserver.cpp

    r1652 r1655  
    865865} 
    866866 
     867std::vector< DBus::Struct<DBus::String, int> > 
     868CrossbarRouter::getSources() 
     869{ 
     870    return std::vector< DBus::Struct<DBus::String, int> >(); 
     871} 
     872 
     873std::vector< DBus::Struct<DBus::String, int> > 
     874CrossbarRouter::getDestinations() 
     875{ 
     876    return std::vector< DBus::Struct<DBus::String, int> >(); 
     877} 
     878 
    867879std::vector< DBus::Int32 > 
    868880CrossbarRouter::getDestinationsForSource(const DBus::Int32 &idx) 
  • trunk/libffado/support/dbus/controlserver.h

    r1652 r1655  
    336336    std::vector< DBus::String > getDestinationNames(); 
    337337 
     338    std::vector< DBus::Struct<DBus::String, int> > getSources(); 
     339    std::vector< DBus::Struct<DBus::String, int> > getDestinations(); 
     340 
    338341    std::vector< DBus::Int32 > getDestinationsForSource(const DBus::Int32 &); 
    339342    DBus::Int32 getSourceForDestination(const DBus::Int32 &);