Changeset 2005

Show
Ignore:
Timestamp:
11/20/11 03:25:56 (9 years ago)
Author:
jwoithe
Message:

rme: initial experiments to hook the MatrixMixer? widget into the RME ffado-mixer module. More to be done.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/rme/rme_avdevice.cpp

    r2004 r2005  
    194194 
    195195    result &= m_MixerContainer->addElement( 
    196         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_FADER, "Input faders")); 
     196        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_INPUT_FADER, "InputFaders")); 
    197197    result &= m_MixerContainer->addElement( 
    198         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_FADER, "Playback faders")); 
     198        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_PLAYBACK_FADER, "PlaybackFaders")); 
    199199    result &= m_MixerContainer->addElement( 
    200         new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_FADER, "Output faders")); 
     200        new RmeSettingsMatrixCtrl(*this, RME_MATRIXCTRL_OUTPUT_FADER, "OutputFaders")); 
    201201 
    202202    if (!result) { 
  • trunk/libffado/support/mixer-qt4/ffado/mixer/rme.py

    r1691 r2005  
    2121# 
    2222 
     23from PyQt4 import QtGui 
     24 
    2325from PyQt4.QtCore import SIGNAL, SLOT, QObject, Qt 
    2426from PyQt4.QtGui import QWidget, QApplication 
    2527from ffado.config import * 
     28 
     29from ffado.widgets.matrixmixer import MatrixMixer 
    2630 
    2731import logging 
     
    119123 
    120124    def initValues(self): 
     125 
     126        # Initial experiments with the MatrixMixer widget 
     127        # print self.hw.servername 
     128        # print self.hw.basepath 
     129        # self.inputmatrix = MatrixMixer(self.hw.servername, self.hw.basepath+"/Mixer/InputFaders", self) 
     130        # self.mbox = QtGui.QVBoxLayout(self.mixer) 
     131        # self.mbox.addWidget(self.inputmatrix) 
     132 
    121133        # Is the device streaming? 
    122134        #self.is_streaming = self.hw.getDiscrete('/Mixer/Info/IsStreaming')