Changeset 1643

Show
Ignore:
Timestamp:
08/30/09 14:41:28 (14 years ago)
Author:
arnonym
Message:

Implement a very first interface for the crossbarrouter. currently its read-only.

With 81 sources and 83 destinations initialization of the mixer takes its time. Mostly because each connection is checked individually. Would be faster to use the getConnectionMap function defined in the dbus interface. Unfortunately this doesn't seem to be implemented currently.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libffado/support/mixer-qt4/ffado/mixer/saffire_dice.py

    r1640 r1643  
    2222import dbus 
    2323 
    24 from ffado.matrixmixer import * 
     24from ffado.widgets.matrixmixer import MatrixMixer 
     25from ffado.widgets.crossbarrouter import * 
    2526 
    2627class Saffire_Dice(QtGui.QWidget): 
    …… 
    2930        self.layout = QtGui.QGridLayout(self) 
    3031        self.setLayout(self.layout) 
    31         self.mixerwidget = QtGui.QScrollArea(self) 
    32         self.mixerwidget.setWidgetResizable(True) 
    33         self.layout.addWidget(self.mixerwidget) 
     32        self.tabs = QtGui.QTabWidget(self) 
     33        self.layout.addWidget(self.tabs) 
     34        #self.mixerwidget = QtGui.QScrollArea(self) 
     35        #self.mixerwidget.setWidgetResizable(True) 
     36        #self.layout.addWidget(self.mixerwidget) 
    3437 
    3538    def buildMixer(self): 
    …… 
    3740        #print self.hw.getText("/Generic/Nickname") 
    3841        self.matrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/EAP/MatrixMixer", self) 
    39         self.mixerwidget.setWidget(self.matrix) 
     42        #self.mixerwidget.setWidget(self.matrix) 
     43        scrollarea = QtGui.QScrollArea(self.tabs) 
     44        scrollarea.setWidgetResizable(True) 
     45        scrollarea.setWidget(self.matrix) 
     46        self.tabs.addTab(scrollarea, "Matrix") 
     47 
     48        self.router = CrossbarRouter(self.hw.servername, self.hw.basepath+"/EAP/Router", self) 
     49        scrollarea = QtGui.QScrollArea(self.tabs) 
     50        scrollarea.setWidgetResizable(True) 
     51        scrollarea.setWidget(self.router) 
     52        self.tabs.addTab(scrollarea, "Routing") 
    4053 
    4154    #def getDisplayTitle(self):