LADI
/
laditools
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make things look a bit better for a merge

This commit is contained in:
Marc-Olivier Barre 2010-01-06 16:51:59 +01:00
parent 1a1f05c283
commit e246c2633b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ladilog
View File

@ -70,20 +70,19 @@ class ladilog (gtk.glade.XML):
{
'name': 'JACK',
'config_name': 'jackdbus_log',
'config_default': os.sep.join([os.environ['HOME'], ".log", "jack", "jackdbus.log"]),
'config_default': os.sep.join([os.environ['HOME'], ".log", "jack", "jackdbus.log"])
},
{
'name': 'LADISH',
'config_name': 'ladish_log',
'config_default': os.sep.join([os.environ['HOME'], ".log", "ladish", "ladish.log"]),
'config_default': os.sep.join([os.environ['HOME'], ".log", "ladish", "ladish.log"])
},
{
'name': 'A2J',
'config_name': 'a2j_log',
'config_default': os.sep.join([os.environ['HOME'], ".log", "a2j", "a2j.log"]),
},
'config_default': os.sep.join([os.environ['HOME'], ".log", "a2j", "a2j.log"])
}
]
# Handle the configuration
self.global_config = laditools.config ()
self.param_dict = self.global_config.get_config_section ('ladilog')

6
lib/laditools/jack_configure.py
View File

@ -35,12 +35,12 @@ def dbus_type_to_python_type (dbus_value):
return dbus_value
class jack_configure:
def __init__ (self, mainloop):
def __init__ (self):
# Connect to the bus
self.bus = dbus.SessionBus (mainloop)
self.bus = dbus.SessionBus ()
self.controller = self.bus.get_object (service_name, "/org/jackaudio/Controller")
self.iface = dbus.Interface (self.controller, controller_interface_name)
self.bus.add_signal_receiver (self.name_owner_changed, dbus_interface = controller_interface_name, signal_name = "NameOwnerChanged")
# self.bus.add_signal_receiver (self.name_owner_changed, dbus_interface = controller_interface_name, signal_name = "NameOwnerChanged")
def name_owner_changed (name = None, old_owner = None, new_owner = None):
print "Name changed : %r" % name

6
lib/laditools/jack_controller.py
View File

@ -23,12 +23,12 @@ controller_interface_name = name_base + '.JackControl'
service_name = name_base + '.service'
class jack_controller:
def __init__ (self, mainloop):
def __init__ (self):
# Connect to the bus
self.bus = dbus.SessionBus (mainloop)
self.bus = dbus.SessionBus ()
self.controller = self.bus.get_object (service_name, "/org/jackaudio/Controller")
self.iface = dbus.Interface (self.controller, controller_interface_name)
self.bus.add_signal_receiver (self.name_owner_changed, dbus_interface = controller_interface_name, signal_name = "NameOwnerChanged")
# self.bus.add_signal_receiver (self.name_owner_changed, dbus_interface = controller_interface_name, signal_name = "NameOwnerChanged")
def name_owner_changed (name = None, old_owner = None, new_owner = None):
print "Name changed : %r" % name

7
lib/laditools/ladimenu.py
View File

@ -90,7 +90,8 @@ class manager:
dlg.run()
dlg.destroy()
return
self.set_starting_status()
# This has nothing to do here... I suppose
# self.set_starting_status()
self.get_jack_controller().start()
def jack_stop(self):
@ -289,8 +290,8 @@ class manager:
# Add the laucher entries at the beginning of the menu
for items in self.menu_array:
menu_label = items.keys()
path = items.values()
menu_label = items.keys()[0]
path = items.values()[0]
menu_items.append((gtk.ImageMenuItem(menu_label), self.on_menu_launcher, path))
menu = gtk.Menu()