Changeset 1652

Show
Ignore:
Timestamp:
09/04/09 12:40:19 (14 years ago)
Author:
arnonym
Message:

Getting the destination index for each peak is enough. Its always only one source per destination, so the destination is a unique identifier.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1651 r1652  
    293293      </method> 
    294294      <method name="getPeakValues"> 
    295           <arg type="a(iid)" name="values" direction="out"/> 
     295          <arg type="a(id)" name="values" direction="out"/> 
    296296      </method> 
    297297  </interface> 

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

    r1651 r1652  
    942942    return m_Slave.getPeakValue(source, dest); 
    943943} 
    944 std::vector< DBus::Struct<int, int, double> > 
     944std::vector< DBus::Struct<int, double> > 
    945945CrossbarRouter::getPeakValues() 
    946946{ 
    947947    //return std::vector< DBus::Struct<int, int, double> >(); 
    948     std::vector< DBus::Struct<int, int, double> > out; 
     948    std::vector< DBus::Struct<int, double> > out; 
    949949    Control::CrossbarRouter::PeakValues values = m_Slave.getPeakValues(); 
    950950    for ( unsigned int i=0; i<values.size(); ++i ) { 
    951         DBus::Struct<int, int, double> tmp; 
    952         tmp._1 = values[i].source; 
    953         tmp._2 = values[i].destination; 
    954         tmp._3 = values[i].peakvalue; 
     951        DBus::Struct<int, double> tmp; 
     952        tmp._1 = values[i].destination; 
     953        tmp._2 = values[i].peakvalue; 
    955954        out.push_back(tmp); 
    956955    } 

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

    r1651 r1652  
    355355    DBus::Double getPeakValue(const DBus::Int32 &source, const DBus::Int32 &dest); 
    356356 
    357     std::vector< DBus::Struct<int, int, double> > getPeakValues(); 
     357    std::vector< DBus::Struct<int, double> > getPeakValues(); 
    358358 
    359359    std::vector< DBus::Int32 > getConnectionMap();