Index: /branches/libffado-2.0/support/mixer-qt4/mixer_motu.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/mixer_motu.py (revision 1365)
+++ /branches/libffado-2.0/support/mixer-qt4/mixer_motu.py (revision 1367)
@@ -25,4 +25,7 @@
from PyQt4.QtGui import QWidget
from mixer_motuui import *
+
+import logging
+log = logging.getLogger('motu')
# Model defines. These must agree with what is used in motu_avdevice.h.
@@ -514,6 +517,6 @@
sender = self.sender()
vol = 128-a0
- print "setting %s for mix %d channel %d to %d" % (self.ChannelFaders[sender][0],
- self.ChannelFaders[sender][1], self.ChannelFaders[sender][2], vol)
+ log.debug("setting %s for mix %d channel %d to %d" % (self.ChannelFaders[sender][0],
+ self.ChannelFaders[sender][1], self.ChannelFaders[sender][2], vol))
self.hw.setMatrixMixerValue(self.ChannelFaders[sender][0],
self.ChannelFaders[sender][1], self.ChannelFaders[sender][2], vol)
@@ -523,6 +526,6 @@
sender = self.sender()
val = a0
- print "setting %s for mix %d channel %d to %d" % (self.ChannelControls[sender][0],
- self.ChannelControls[sender][1], self.ChannelControls[sender][2], val)
+ log.debug("setting %s for mix %d channel %d to %d" % (self.ChannelControls[sender][0],
+ self.ChannelControls[sender][1], self.ChannelControls[sender][2], val))
self.hw.setMatrixMixerValue(self.ChannelControls[sender][0],
self.ChannelControls[sender][1], self.ChannelControls[sender][2], val)
@@ -532,5 +535,5 @@
sender = self.sender()
val = a0
- print "setting %s control to %d" % (self.Controls[sender][0], val)
+ log.debug("setting %s control to %d" % (self.Controls[sender][0], val))
self.hw.setDiscrete(self.Controls[sender][0], val)
@@ -539,6 +542,6 @@
sender = self.sender()
val=a0
- print "setting %s for mix %d channel %d switch to %d" % (self.ChannelBinarySwitches[sender][0],
- self.ChannelBinarySwitches[sender][1], self.ChannelBinarySwitches[sender][2], val)
+ log.debug("setting %s for mix %d channel %d switch to %d" % (self.ChannelBinarySwitches[sender][0],
+ self.ChannelBinarySwitches[sender][1], self.ChannelBinarySwitches[sender][2], val))
self.hw.setMatrixMixerValue(self.ChannelBinarySwitches[sender][0],
self.ChannelBinarySwitches[sender][1], self.ChannelBinarySwitches[sender][2], val)
@@ -548,5 +551,5 @@
sender = self.sender()
val=a0
- print "setting %s switch to %d" % (self.BinarySwitches[sender][0], val)
+ log.debug("setting %s switch to %d" % (self.BinarySwitches[sender][0], val))
self.hw.setDiscrete(self.BinarySwitches[sender][0], val)
@@ -555,5 +558,5 @@
sender = self.sender()
vol = 128-a0
- print "setting %s mix fader to %d" % (self.Faders[sender][0], vol)
+ log.debug("setting %s mix fader to %d" % (self.Faders[sender][0], vol))
self.hw.setDiscrete(self.Faders[sender][0], vol)
@@ -562,5 +565,5 @@
sender = self.sender()
dest=a0
- print "setting %s mix destination to %d" % (self.MixDests[sender][0], dest)
+ log.debug("setting %s mix destination to %d" % (self.MixDests[sender][0], dest))
self.hw.setDiscrete(self.MixDests[sender][0], dest)
@@ -572,5 +575,5 @@
name=a0
state = a1
- print "setting %s state to %d" % (name, state)
+ log.debug("setting %s state to %d" % (name, state))
self.hw.setDiscrete(self.SelectorControls[name][0], state)
@@ -583,19 +586,19 @@
# Is the device streaming?
self.is_streaming = self.hw.getDiscrete('/Mixer/Info/IsStreaming')
- print "device streaming flag: %d" % (self.is_streaming)
+ log.debug("device streaming flag: %d" % (self.is_streaming))
# Retrieve other device settings as needed
self.model = self.hw.getDiscrete('/Mixer/Info/Model')
- print "device model identifier: %d" % (self.model)
+ log.debug("device model identifier: %d" % (self.model))
self.sample_rate = self.hw.getDiscrete('/Mixer/Info/SampleRate')
- print "device sample rate: %d" % (self.sample_rate)
+ log.debug("device sample rate: %d" % (self.sample_rate))
self.has_mic_inputs = self.hw.getDiscrete('/Mixer/Info/HasMicInputs')
- print "device has mic inputs: %d" % (self.has_mic_inputs)
+ log.debug("device has mic inputs: %d" % (self.has_mic_inputs))
self.has_aesebu_inputs = self.hw.getDiscrete('/Mixer/Info/HasAESEBUInputs')
- print "device has AES/EBU inputs: %d" % (self.has_aesebu_inputs)
+ log.debug("device has AES/EBU inputs: %d" % (self.has_aesebu_inputs))
self.has_spdif_inputs = self.hw.getDiscrete('/Mixer/Info/HasSPDIFInputs')
- print "device has SPDIF inputs: %d" % (self.has_spdif_inputs)
+ log.debug("device has SPDIF inputs: %d" % (self.has_spdif_inputs))
self.has_optical_spdif = self.hw.getDiscrete('/Mixer/Info/HasOpticalSPDIF')
- print "device has optical SPDIF: %d" % (self.has_optical_spdif)
+ log.debug("device has optical SPDIF: %d" % (self.has_optical_spdif))
# Customise the UI based on device options retrieved
@@ -662,5 +665,5 @@
# Some controls must be disabled if the device is streaming
if (self.is_streaming):
- print "Disabling controls which require inactive streaming"
+ log.debug("Disabling controls which require inactive streaming")
self.optical_in_mode.setEnabled(False)
self.optical_out_mode.setEnabled(False)
@@ -668,5 +671,5 @@
# Some channels aren't available at higher sampling rates
if (self.sample_rate > 96000):
- print "Disabling controls not present above 96 kHz"
+ log.debug("Disabling controls not present above 96 kHz")
self.mix1_tab.setTabEnabled(3, False) # ADAT
self.mix1_tab.setTabEnabled(2, False) # SPDIF
@@ -682,5 +685,5 @@
self.mix4_tab.setTabEnabled(1, False) # AES/EBU
if (self.sample_rate > 48000):
- print "Disabling controls not present above 48 kHz"
+ log.debug("Disabling controls not present above 48 kHz")
self.mix1_adat5.setEnabled(False)
self.mix1_adat6.setEnabled(False)
@@ -754,5 +757,5 @@
continue
vol = 128-self.hw.getMatrixMixerValue(info[0], info[1], info[2])
- print "%s for mix %d channel %d is %d" % (info[0], info[1], info[2], vol)
+ log.debug("%s for mix %d channel %d is %d" % (info[0], info[1], info[2], vol))
ctrl.setValue(vol)
QObject.connect(ctrl, SIGNAL('valueChanged(int)'), self.updateChannelFader)
@@ -762,5 +765,5 @@
continue
vol = 128-self.hw.getDiscrete(info[0])
- print "%s mix fader is %d" % (info[0] , vol)
+ log.debug("%s mix fader is %d" % (info[0] , vol))
ctrl.setValue(vol)
QObject.connect(ctrl, SIGNAL('valueChanged(int)'), self.updateFader)
@@ -770,5 +773,5 @@
continue
pan = self.hw.getMatrixMixerValue(info[0], info[1], info[2])
- print "%s for mix %d channel %d is %d" % (info[0], info[1], info[2], pan)
+ log.debug("%s for mix %d channel %d is %d" % (info[0], info[1], info[2], pan))
ctrl.setValue(pan)
QObject.connect(ctrl, SIGNAL('valueChanged(int)'), self.updateChannelControl)
@@ -778,5 +781,5 @@
continue
pan = self.hw.getDiscrete(info[0])
- print "%s control is %d" % (info[0] , pan)
+ log.debug("%s control is %d" % (info[0] , pan))
ctrl.setValue(pan)
QObject.connect(ctrl, SIGNAL('valueChanged(int)'), self.updateControl)
@@ -784,5 +787,5 @@
# Disable the channel pair controls since they aren't yet implemented
for ctrl, info in self.PairSwitches.iteritems():
- print "%s control is not implemented yet: disabling" % (info[0])
+ log.debug("%s control is not implemented yet: disabling" % (info[0]))
ctrl.setEnabled(False)
@@ -791,5 +794,5 @@
continue
val = self.hw.getMatrixMixerValue(info[0], info[1], info[2])
- print "%s for mix %d channel %d is %d" % (info[0] , info[1], info[2], val)
+ log.debug("%s for mix %d channel %d is %d" % (info[0] , info[1], info[2], val))
if val:
ctrl.setChecked(True)
@@ -802,5 +805,5 @@
continue
val = self.hw.getDiscrete(info[0])
- print "%s switch is %d" % (info[0] , val)
+ log.debug("%s switch is %d" % (info[0] , val))
if val:
ctrl.setChecked(True)
@@ -813,5 +816,5 @@
continue
dest = self.hw.getDiscrete(info[0])
- print "%s mix destination is %d" % (info[0] , dest)
+ log.debug("%s mix destination is %d" % (info[0] , dest))
ctrl.setCurrentIndex(dest)
QObject.connect(ctrl, SIGNAL('activated(int)'), self.updateMixDest)
@@ -819,6 +822,6 @@
for name, ctrl in self.SelectorControls.iteritems():
state = self.hw.getDiscrete(ctrl[0])
- print "%s state is %d" % (name , state)
- ctrl[1].setCurrentIndex(state)
+ log.debug("%s state is %d" % (name , state))
+ ctrl[1].setCurrentIndex(state)
# FIXME: If optical mode is not ADAT, disable ADAT controls here.
Index: /branches/libffado-2.0/support/mixer-qt4/ffado_dbus_util.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/ffado_dbus_util.py (revision 1298)
+++ /branches/libffado-2.0/support/mixer-qt4/ffado_dbus_util.py (revision 1367)
@@ -26,4 +26,7 @@
import dbus.mainloop.qt
dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
+
+import logging
+log = logging.getLogger('dbus')
class ControlInterface:
@@ -43,5 +46,5 @@
dev_cont.setValueIdx(idx,v)
except:
- print "Failed to set Continuous %s on server %s" % (path, self.servername)
+ log.error("Failed to set Continuous %s on server %s" % (path, self.servername))
def getContignuous(self, subpath, idx=None):
@@ -55,5 +58,5 @@
return dev_cont.getValueIdx(idx)
except:
- print "Failed to get Continuous %s on server %s" % (path, self.servername)
+ log.error("Failed to get Continuous %s on server %s" % (path, self.servername))
return 0
@@ -65,5 +68,5 @@
dev_cont.setValue(v)
except:
- print "Failed to set Discrete %s on server %s" % (path, self.servername)
+ log.error("Failed to set Discrete %s on server %s" % (path, self.servername))
def getDiscrete(self, subpath):
@@ -74,5 +77,5 @@
return dev_cont.getValue()
except:
- print "Failed to get Discrete %s on server %s" % (path, self.servername)
+ log.error("Failed to get Discrete %s on server %s" % (path, self.servername))
return 0
@@ -84,5 +87,5 @@
dev_cont.setValue(v)
except:
- print "Failed to set Text %s on server %s" % (path, self.servername)
+ log.error("Failed to set Text %s on server %s" % (path, self.servername))
def getText(self, subpath):
@@ -93,5 +96,5 @@
return dev_cont.getValue()
except:
- print "Failed to get Text %s on server %s" % (path, self.servername)
+ log.error("Failed to get Text %s on server %s" % (path, self.servername))
return 0
@@ -103,5 +106,5 @@
dev_cont.setValue(row, col, v)
except:
- print "Failed to set MatrixMixer %s on server %s" % (path, self.servername)
+ log.error("Failed to set MatrixMixer %s on server %s" % (path, self.servername))
def getMatrixMixerValue(self, subpath, row, col):
@@ -112,5 +115,5 @@
return dev_cont.getValue(row, col)
except:
- print "Failed to get MatrixMixer %s on server %s" % (path, self.servername)
+ log.error("Failed to get MatrixMixer %s on server %s" % (path, self.servername))
return 0
@@ -122,5 +125,5 @@
dev_cont.select(v)
except:
- print "Failed to select %s on server %s" % (path, self.servername)
+ log.error("Failed to select %s on server %s" % (path, self.servername))
def enumSelected(self, subpath):
@@ -131,5 +134,5 @@
return dev_cont.selected()
except:
- print "Failed to get selected enum %s on server %s" % (path, self.servername)
+ log.error("Failed to get selected enum %s on server %s" % (path, self.servername))
return 0
@@ -141,5 +144,5 @@
return dev_cont.getEnumLabel(v)
except:
- print "Failed to get enum label %s on server %s" % (path, self.servername)
+ log.error("Failed to get enum label %s on server %s" % (path, self.servername))
return 0
@@ -151,5 +154,5 @@
return dev_cont.count()
except:
- print "Failed to get enum count %s on server %s" % (path, self.servername)
+ log.error("Failed to get enum count %s on server %s" % (path, self.servername))
return 0
@@ -175,5 +178,5 @@
# and qt3 doesn't provide one for python/dbus
try:
- print "connecting to: Updated on %s (server: %s)" % (self.basepath, self.servername)
+ log.debug("connecting to: Updated on %s (server: %s)" % (self.basepath, self.servername))
self.dev.connect_to_signal("Updated", self.updateSignal, \
dbus_interface="org.ffado.Control.Element.Container")
@@ -213,38 +216,50 @@
def updateSignal(self):
- print ("Received update signal")
+ log.debug("Received update signal")
for handler in self.updateSignalHandlers:
arg = self.updateSignalHandlerArgs[handler]
- if arg:
- handler(arg)
- else:
- handler()
+ try:
+ if arg:
+ handler(arg)
+ else:
+ handler()
+ except:
+ log.error("Failed to execute handler %s" % handler)
def preUpdateSignal(self):
- print ("Received pre-update signal")
+ log.debug("Received pre-update signal")
for handler in self.preUpdateSignalHandlers:
arg = self.preUpdateSignalHandlerArgs[handler]
- if arg:
- handler(arg)
- else:
- handler()
+ try:
+ if arg:
+ handler(arg)
+ else:
+ handler()
+ except:
+ log.error("Failed to execute handler %s" % handler)
def postUpdateSignal(self):
- print ("Received post-update signal")
+ log.debug("Received post-update signal")
for handler in self.postUpdateSignalHandlers:
arg = self.postUpdateSignalHandlerArgs[handler]
- if arg:
- handler(arg)
- else:
- handler()
+ try:
+ if arg:
+ handler(arg)
+ else:
+ handler()
+ except:
+ log.error("Failed to execute handler %s" % handler)
def destroyedSignal(self):
- print ("Received destroyed signal")
+ log.debug("Received destroyed signal")
for handler in self.destroyedSignalHandlers:
arg = self.destroyedSignalHandlerArgs[handler]
- if arg:
- handler(arg)
- else:
- handler()
+ try:
+ if arg:
+ handler(arg)
+ else:
+ handler()
+ except:
+ log.error("Failed to execute handler %s" % handler)
def getNbDevices(self):
Index: /branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py (revision 1364)
+++ /branches/libffado-2.0/support/mixer-qt4/ffado_panelmanager.py (revision 1367)
@@ -46,8 +46,11 @@
from mixer_global import GlobalMixer
+import logging
+log = logging.getLogger('panelmanager')
+
use_generic = False
try:
from mixer_generic import *
- print "The generic mixer is found, seems to be a developer using ffadomixer..."
+ log.info("The generic mixer is found, seems to be a developer using ffadomixer...")
except ImportError:
pass
@@ -133,8 +136,8 @@
w.polledUpdate()
except:
- print "error in polled update"
+ log.error("error in polled update")
def devlistPreUpdate(self):
- print "devlistPreUpdate"
+ log.debug("devlistPreUpdate")
self.tabs.setEnabled(False)
self.tabs.hide()
@@ -143,12 +146,12 @@
def devlistPostUpdate(self):
- print "devlistPostUpdate"
+ log.debug("devlistPostUpdate")
self.updatePanels()
def devlistUpdate(self):
- print "devlistUpdate"
+ log.debug("devlistUpdate")
def devmgrDestroyed(self):
- print "devmgrDestroyed"
+ log.debug("devmgrDestroyed")
self.alivetimer.stop()
self.tabs.setEnabled(False)
@@ -161,5 +164,5 @@
nbDevices = self.devmgr.getNbDevices()
except:
- print "comms lost"
+ log.debug("comms lost")
self.tabs.setEnabled(False)
self.tabs.hide()
@@ -192,7 +195,7 @@
if not guid in guids_present:
to_remove.append(guid)
- print "going to remove %s" % str(guid)
+ log.debug("going to remove %s" % str(guid))
else:
- print "going to keep %s" % str(guid)
+ log.debug("going to keep %s" % str(guid))
# figure out what to add
@@ -201,5 +204,5 @@
if not guid in guids_with_tabs:
to_add.append(guid)
- print "going to add %s" % str(guid)
+ log.debug("going to add %s" % str(guid))
# update the widget
@@ -215,5 +218,5 @@
idx = guid_indexes[guid]
path = self.devmgr.getDeviceName(idx)
- print "Adding device %d: %s" % (idx, path)
+ log.debug("Adding device %d: %s" % (idx, path))
cfgrom = ConfigRomInterface(FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH+'/DeviceManager/'+path)
@@ -224,5 +227,5 @@
vendorName = cfgrom.getVendorName()
modelName = cfgrom.getModelName()
- print " Found (%s, %X, %X) %s %s" % (str(guid), vendorId, modelId, vendorName, modelName)
+ log.debug(" Found (%s, %X, %X) %s %s" % (str(guid), vendorId, modelId, vendorName, modelName))
# check whether this has already been registered at ffado.org
Index: /branches/libffado-2.0/support/mixer-qt4/ffado_regdialog.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/ffado_regdialog.py (revision 1298)
+++ /branches/libffado-2.0/support/mixer-qt4/ffado_regdialog.py (revision 1367)
@@ -24,4 +24,7 @@
from PyQt4.QtGui import QDialog
from ffado_regdialogui import Ui_ffadoRegDialogUI
+
+import logging
+log = logging.getLogger('registration')
REGISTRATION_MESSAGE = """
@@ -66,11 +69,11 @@
sender = self.sender()
if sender == self.btnSend:
- print "user chose to send"
+ log.debug("user chose to send")
self.choice = "send"
elif sender == self.btnNoSend:
- print "user chose not to send"
+ log.debug("user chose not to send")
self.choice = "nosend"
elif sender == self.btnNeverSend:
- print "user chose to never send"
+ log.debug("user chose to never send")
self.choice = "neversend"
self.close()
Index: /branches/libffado-2.0/support/mixer-qt4/mixer_edirolfa66.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/mixer_edirolfa66.py (revision 1364)
+++ /branches/libffado-2.0/support/mixer-qt4/mixer_edirolfa66.py (revision 1367)
@@ -24,4 +24,7 @@
from PyQt4.QtGui import QWidget
from mixer_edirolfa66ui import *
+
+import logging
+log = logging.getLogger('edirolfa66')
class EdirolFa66Control(QWidget, Ui_EdirolFa66ControlUI):
@@ -86,5 +89,5 @@
val = -val
ctrl = self.VolumeControls[name]
- print "setting %s to %d" % (name, val)
+ log.debug("setting %s to %d" % (name, val))
self.hw.setContignuous(ctrl[0], val, idx = ctrl[1])
@@ -92,5 +95,5 @@
for name, ctrl in self.VolumeControls.iteritems():
val = self.hw.getContignuous(ctrl[0], idx = ctrl[1])
- print "%s value is %d" % (name , val)
+ log.debug("%s value is %d" % (name , val))
# Workaround: The current value is not properly initialized
@@ -103,4 +106,4 @@
else:
val = -32768
-
+
ctrl[2].setValue(-val)
Index: /branches/libffado-2.0/support/mixer-qt4/mixer_saffire_base.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/mixer_saffire_base.py (revision 1298)
+++ /branches/libffado-2.0/support/mixer-qt4/mixer_saffire_base.py (revision 1367)
@@ -23,4 +23,7 @@
from PyQt4.QtCore import SIGNAL, SLOT, QObject
+import logging
+log = logging.getLogger('saffirebase')
+
# the class that holds all actual control code
class SaffireMixerBase:
@@ -32,9 +35,9 @@
#vol = 0x7FFF-a0
vol = a0
- print "set %s %d %d to %d" % (
+ log.debug("set %s %d %d to %d" % (
self.VolumeControls[sender][0],
self.VolumeControls[sender][1],
self.VolumeControls[sender][2],
- vol)
+ vol))
self.hw.setMatrixMixerValue(self.VolumeControls[sender][0],
self.VolumeControls[sender][1],
@@ -44,7 +47,7 @@
sender = self.sender()
vol = a0
- print "set %s to %d" % (
+ log.debug("set %s to %d" % (
self.VolumeControlsLowRes[sender][0],
- vol)
+ vol))
self.hw.setDiscrete(self.VolumeControlsLowRes[sender][0], vol)
@@ -55,7 +58,7 @@
else:
state = 0
- print "set %s to %d" % (
+ log.debug("set %s to %d" % (
self.SelectorControls[sender][0],
- state)
+ state))
self.hw.setDiscrete(self.SelectorControls[sender][0], state)
@@ -72,6 +75,6 @@
def triggerButton(self):
sender = self.sender()
- print "trigger %s" % (
- self.TriggerButtonControls[sender][0])
+ log.debug("trigger %s" % (
+ self.TriggerButtonControls[sender][0]))
self.hw.setDiscrete(self.TriggerButtonControls[sender][0], 1)
@@ -79,6 +82,6 @@
sender = self.sender()
textbox = self.saveTextControls[sender][0]
- print "save %s" % (
- textbox.text().ascii())
+ log.debug("save %s" % (
+ textbox.text().ascii()))
self.hw.setText(self.TextControls[textbox][0], textbox.text().ascii())
@@ -102,5 +105,5 @@
self.VolumeControls[ctrl][1],
self.VolumeControls[ctrl][2])
- print "%s volume is %d" % (ctrl.objectName() , 0x7FFF-vol)
+ log.debug("%s volume is %d" % (ctrl.objectName() , 0x7FFF-vol))
#ctrl.setValue(0x7FFF-vol)
ctrl.setValue(vol)
@@ -108,10 +111,10 @@
vol = self.hw.getDiscrete(self.VolumeControlsLowRes[ctrl][0])
- print "%s volume is %d" % (ctrl.objectName() , vol)
+ log.debug("%s volume is %d" % (ctrl.objectName() , vol))
ctrl.setValue(vol)
for ctrl, info in self.SelectorControls.iteritems():
state = self.hw.getDiscrete(self.SelectorControls[ctrl][0])
- print "%s state is %d" % (ctrl.objectName() , state)
+ log.debug("%s state is %d" % (ctrl.objectName() , state))
if state:
ctrl.setChecked(True)
@@ -124,5 +127,5 @@
for ctrl, info in self.TextControls.iteritems():
text = self.hw.getText(self.TextControls[ctrl][0])
- print "%s text is %s" % (ctrl.objectName() , text)
+ log.debug("%s text is %s" % (ctrl.objectName() , text))
ctrl.setText(text)
@@ -132,5 +135,5 @@
def polledUpdateVolumeLowRes(self, srcpath, ctrl):
vol = self.hw.getDiscrete(srcpath)
- #print "polledUpdateVolumeLowRes: vol = %s" % vol
+ #log.debug("polledUpdateVolumeLowRes: vol = %s" % vol)
#ctrl.setValue(255-vol)
ctrl.setValue(vol)
Index: /branches/libffado-2.0/support/mixer-qt4/mixer_quatafire.py
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/mixer_quatafire.py (revision 1364)
+++ /branches/libffado-2.0/support/mixer-qt4/mixer_quatafire.py (revision 1367)
@@ -24,4 +24,7 @@
from PyQt4.QtGui import QWidget
from mixer_quatafireui import *
+
+import logging
+log = logging.getLogger('quatafire')
class QuataFireMixer(QWidget, Ui_QuataFireMixerUI):
@@ -55,5 +58,5 @@
sender = self.sender()
vol = -a0
- print "setting %s volume to %d" % (self.VolumeControls[sender][0], vol)
+ log.debug("setting %s volume to %d" % (self.VolumeControls[sender][0], vol))
self.hw.setContignuous(self.VolumeControls[sender][0], vol, self.VolumeControls[sender][1])
@@ -68,7 +71,7 @@
pan_right = 0
- print "setting %s pan left to %d" % (self.PanControls[sender][0], -pan_left)
+ log.debug("setting %s pan left to %d" % (self.PanControls[sender][0], -pan_left))
self.hw.setContignuous(self.PanControls[sender][0], -pan_left, 1)
- print "setting %s pan right to %d" % (self.PanControls[sender][0], -pan_right)
+ log.debug("setting %s pan right to %d" % (self.PanControls[sender][0], -pan_right))
self.hw.setContignuous(self.PanControls[sender][0], -pan_right, 2)
@@ -77,5 +80,5 @@
vol = self.hw.getContignuous(self.VolumeControls[ctrl][0], self.VolumeControls[ctrl][1])
val = -vol
- print "%s volume is %d, set to %d" % (ctrl.objectName(), vol, val)
+ log.debug("%s volume is %d, set to %d" % (ctrl.objectName(), vol, val))
ctrl.setValue(val)
@@ -87,6 +90,6 @@
pan_right = self.hw.getContignuous(self.PanControls[ctrl][0], 2)
- print "%s pan left is %d" % (ctrl.objectName() , pan_left)
- print "%s pan right is %d" % (ctrl.objectName() , pan_right)
+ log.debug("%s pan left is %d" % (ctrl.objectName() , pan_left))
+ log.debug("%s pan right is %d" % (ctrl.objectName() , pan_right))
if pan_left == 0:
@@ -94,5 +97,5 @@
else:
val = -pan_left
-
+
ctrl.setValue(val)
# connect the UI element
Index: /branches/libffado-2.0/support/mixer-qt4/ffadomixer.in
===================================================================
--- /branches/libffado-2.0/support/mixer-qt4/ffadomixer.in (revision 1298)
+++ /branches/libffado-2.0/support/mixer-qt4/ffadomixer.in (revision 1367)
@@ -45,4 +45,33 @@
if __name__ == "__main__":
+ #set up logging
+ import logging
+ logging.basicConfig()
+
+ if $DEBUG:
+ debug_level = logging.DEBUG
+ else:
+ debug_level = logging.INFO
+
+ logging.getLogger('main').setLevel(debug_level)
+ logging.getLogger('dbus').setLevel(debug_level)
+ logging.getLogger('registration').setLevel(debug_level)
+ logging.getLogger('panelmanager').setLevel(debug_level)
+
+ logging.getLogger('global').setLevel(debug_level)
+
+ logging.getLogger('audiofire').setLevel(debug_level)
+ logging.getLogger('bridgeco').setLevel(debug_level)
+ logging.getLogger('edirolfa101').setLevel(debug_level)
+ logging.getLogger('edirolfa66').setLevel(debug_level)
+ logging.getLogger('motu').setLevel(debug_level)
+ logging.getLogger('phase24').setLevel(debug_level)
+ logging.getLogger('phase88').setLevel(debug_level)
+ logging.getLogger('quatafire').setLevel(debug_level)
+ logging.getLogger('saffirebase').setLevel(debug_level)
+ logging.getLogger('saffire').setLevel(debug_level)
+ logging.getLogger('saffirepro').setLevel(debug_level)
+
+ log = logging.getLogger('main')
app = QApplication(sys.argv)
@@ -57,9 +86,11 @@
repeat -= 1
except dbus.DBusException, ex:
- print "\n"
- print "==========================================================="
- print "ERROR: Could not communicate with the FFADO DBus service..."
- print "==========================================================="
- print "\n"
+ log.error("")
+ log.error("")
+ log.error("===========================================================")
+ log.error("ERROR: Could not communicate with the FFADO DBus service...")
+ log.error("===========================================================")
+ log.error("")
+ log.error("")
tmp = msg.question( msg, "FFADO-DBus not found", " Probably you didn't start the ffado-dbus-server. Should I try this now?
Device: %s %s
Vendor/Model Id: %X/%X
Device GUID: %016X
FFADO Version: %s
E-Mail: %s