From ce89a5046907a6798daa83b3557cd89f2f05c50e Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 2 Mar 2008 15:16:12 +0000 Subject: [PATCH] * Fix some weird behavior with the way parametters where handled git-svn-id: svn+ssh://svn.marcochapeau.org/laditools/trunk@106 bfe161da-02ef-4cea-8c43-ae261ea21ac6 --- MANIFEST.in | 2 ++ jackconf | 12 ++++---- lib/pyjackctl/jack_configure.py | 53 +++++++++++---------------------- 3 files changed, 25 insertions(+), 42 deletions(-) create mode 100644 MANIFEST.in diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..391996d --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +recursive-include data *.svg *.glade +include TODO INSTALL COPYING diff --git a/jackconf b/jackconf index d811e8a..4ec071d 100755 --- a/jackconf +++ b/jackconf @@ -47,11 +47,11 @@ class jackctl_conf(gtk.glade.XML): typestr = self.jack.get_driver_param_type(driver_param) isset, default, value = self.jack.get_driver_param_value(driver_param) short_descr = self.jack.get_driver_short_description(driver_param) - if typestr == "bool": + if typestr == "b": self.driver_vbox_left.pack_start(self.make_checkbox(driver_param, value, short_descr, self.driver_param_dict), False) - elif typestr == "str": + elif typestr == "s": self.driver_vbox_right.pack_start(self.make_textentry(driver_param, value, short_descr, self.driver_param_dict), False) - elif typestr == "uint" or typestr == "sint": + elif typestr == "u" or typestr == "i": self.driver_vbox_right.pack_start(self.make_spinbutton(driver_param, value, short_descr, self.driver_param_dict), False) #Engine tab setup self.engine_vbox_left = self.get_widget("engine_vbox_left") @@ -61,11 +61,11 @@ class jackctl_conf(gtk.glade.XML): typestr = self.jack.get_engine_param_type(engine_param) isset, default, value = self.jack.get_engine_param_value(engine_param) short_descr = self.jack.get_engine_short_description(engine_param) - if typestr == "bool": + if typestr == "b": self.engine_vbox_left.pack_start(self.make_checkbox(engine_param, value, short_descr, self.engine_param_dict), False) - elif typestr == "str": + elif typestr == "s": self.engine_vbox_right.pack_start(self.make_textentry(engine_param, value, short_descr, self.engine_param_dict), False) - elif typestr == "uint" or typestr == "sint": + elif typestr == "u" or typestr == "i": self.engine_vbox_right.pack_start(self.make_spinbutton(engine_param, value, short_descr, self.engine_param_dict), False) def make_checkbox(self, param_name, value, short_descr, storage_dict): diff --git a/lib/pyjackctl/jack_configure.py b/lib/pyjackctl/jack_configure.py index 43f7050..671c1b9 100644 --- a/lib/pyjackctl/jack_configure.py +++ b/lib/pyjackctl/jack_configure.py @@ -27,19 +27,6 @@ def dbus_type_to_python_type(dbus_value): return int(dbus_value) return dbus_value -def dbus_typesig_to_type_string(type_char): - type_char = str(type_char) - if type_char == 'i': - return "sint" - if type_char == 'u': - return "uint" - if type_char == 'y': - return "char" - if type_char == 's': - return "str" - if type_char == 'b': - return "bool" - class jack_configure: def __init__(self): self.bus = dbus.SessionBus() @@ -57,12 +44,9 @@ class jack_configure: def get_driver_param_names(self): infos = self.iface.GetDriverParametersInfo() - names = [] - for info in infos: names.append(info[1]) - return names def get_driver_short_description(self, param): @@ -75,7 +59,7 @@ class jack_configure: def get_driver_param_type(self, param): type_char, name, short_descr, long_descr = self.iface.GetDriverParameterInfo(param) - return dbus_typesig_to_type_string(type_char) + return str(type_char) def get_driver_param_value(self, param): isset, default, value = self.iface.GetDriverParameterValue(param) @@ -86,24 +70,21 @@ class jack_configure: def set_driver_param_value(self, param, value): typestr = self.get_driver_param_type(param) - - if typestr == "bool": - value = dbus.Boolean(value); - elif typestr == "char": - value = dbus.Byte(value); - elif typestr == "sint" or typestr == "uint": + if typestr == "b": + value = dbus.Boolean(value) + elif typestr == "y": + value = dbus.Byte(value) + elif typestr == "i": + value = dbus.Int32(value) + elif typestr == "u": value = dbus.UInt32(value) - self.iface.SetDriverParameterValue(param, value) def get_engine_param_names(self): infos = self.iface.GetEngineParametersInfo() - names = [] - for info in infos: names.append(info[1]) - return names def get_engine_short_description(self, param): @@ -116,7 +97,7 @@ class jack_configure: def get_engine_param_type(self, param): type_char, name, short_descr, long_descr = self.iface.GetEngineParameterInfo(param) - return dbus_typesig_to_type_string(type_char) + return str(type_char) def get_engine_param_value(self, param): isset, default, value = self.iface.GetEngineParameterValue(param) @@ -127,12 +108,12 @@ class jack_configure: def set_engine_param_value(self, param, value): typestr = self.get_engine_param_type(param) - - if typestr == "bool": - value = dbus.Boolean(value); - elif typestr == "char": - value = dbus.Byte(value); - elif typestr == "sint" or typestr == "uint": + if typestr == "b": + value = dbus.Boolean(value) + elif typestr == "y": + value = dbus.Byte(value) + elif typestr == "i": + value = dbus.Int32(value) + elif typestr == "u": value = dbus.UInt32(value) - - self.iface.SetEngineParameterValue(param, value) + self.iface.SetEngineParameterValue(param, value) \ No newline at end of file