From 4405ba85adfadf8f671953ee5f13a74fba5b55da Mon Sep 17 00:00:00 2001 From: jwoithe Date: Fri, 20 Sep 2013 13:05:37 +0000 Subject: [PATCH] dbus-util: add optional index to the discrete control set/get methods. This will be used by a subsequent patch (r2408) to indicate the output channel for fireworks playback routing. For all existing users this modification should not cause any behavioural changes. Patch from Takashi Sakamoto. git-svn-id: svn+ssh://ffado.org/ffado/trunk@2407 2be59082-3212-0410-8809-b0798e1608f0 --- libffado/support/mixer-qt4/ffado/dbus_util.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libffado/support/mixer-qt4/ffado/dbus_util.py b/libffado/support/mixer-qt4/ffado/dbus_util.py index 763af4ce..fe1da202 100644 --- a/libffado/support/mixer-qt4/ffado/dbus_util.py +++ b/libffado/support/mixer-qt4/ffado/dbus_util.py @@ -59,21 +59,27 @@ class ControlInterface: log.error("Failed to get Continuous %s on server %s" % (path, self.servername)) return 0 - def setDiscrete(self, subpath, v): + def setDiscrete(self, subpath, v, idx=None): try: 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) + if idx == None: + dev_cont.setValue(v) + else: + dev_cont.setValueIdx(v, idx) except: log.error("Failed to set Discrete %s on server %s" % (path, self.servername)) - def getDiscrete(self, subpath): + def getDiscrete(self, subpath, idx=None): try: 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() + if idx == None: + return dev_cont.getValue() + else: + return dev_cont.getValueIdx(idx) except: log.error("Failed to get Discrete %s on server %s" % (path, self.servername)) return 0 -- 2.11.4.GIT