Remove "Select JACK driver" stuff
It is duplicate of the "driver" engine option. jack configure interface is changed since Oct 2008
This commit is contained in:
parent
f513d9d72a
commit
a9d2f3fd13
45
ladiconf
45
ladiconf
|
@ -117,50 +117,6 @@ class configure_command:
|
|||
def run(self, arg):
|
||||
pass
|
||||
|
||||
class jack_driver_change_command(configure_command):
|
||||
def get_description(self):
|
||||
return 'Select JACK driver'
|
||||
|
||||
def run(self, arg):
|
||||
dlg = gtk.Dialog()
|
||||
dlg.set_title(self.get_window_title())
|
||||
dlg.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
|
||||
dlg.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
|
||||
|
||||
driver_list = gtk.TreeView()
|
||||
dlg.vbox.pack_start(driver_list, True)
|
||||
|
||||
store = gtk.ListStore(str)
|
||||
|
||||
text_renderer = gtk.CellRendererText()
|
||||
|
||||
column = gtk.TreeViewColumn("Name", text_renderer, text=0)
|
||||
driver_list.append_column(column)
|
||||
|
||||
drivers = jack.get_available_driver()
|
||||
for driver in drivers:
|
||||
store.append([driver])
|
||||
|
||||
driver_list.set_model(store)
|
||||
|
||||
selection = driver_list.get_selection()
|
||||
|
||||
current_driver = jack.get_selected_driver()
|
||||
if current_driver:
|
||||
for row in store:
|
||||
if current_driver == row[0]:
|
||||
selection.select_iter(row.iter)
|
||||
|
||||
driver_list.connect("row-activated", lambda *x: dlg.response(gtk.RESPONSE_OK))
|
||||
|
||||
driver = None
|
||||
|
||||
dlg.show_all()
|
||||
ret = dlg.run()
|
||||
if ret == gtk.RESPONSE_OK:
|
||||
jack.select_driver(store.get(selection.get_selected()[1], 0)[0])
|
||||
dlg.hide()
|
||||
|
||||
class parameter_enum_value(gobject.GObject):
|
||||
def __init__(self, is_fake_value, value, description):
|
||||
gobject.GObject.__init__(self)
|
||||
|
@ -637,7 +593,6 @@ class jack_internal_params_configure_command(jack_params_configure_command):
|
|||
check_ladish()
|
||||
|
||||
commands = [
|
||||
jack_driver_change_command(),
|
||||
jack_engine_params_configure_command(),
|
||||
jack_driver_params_configure_command(),
|
||||
]
|
||||
|
|
|
@ -44,19 +44,9 @@ class jack_configure:
|
|||
def name_owner_changed (name = None, old_owner = None, new_owner = None):
|
||||
print "Name changed : %r" % name
|
||||
|
||||
def get_available_driver (self):
|
||||
is_range, is_strict, is_fake_values, values = self.iface.GetParameterConstraint (['engine', 'driver'])
|
||||
drivers = []
|
||||
for value in values:
|
||||
drivers.append (value[1])
|
||||
return drivers
|
||||
|
||||
def get_selected_driver (self):
|
||||
isset, default, value = self.iface.GetParameterValue (['engine', 'driver'])
|
||||
return value
|
||||
|
||||
def select_driver (self, driver):
|
||||
self.iface.SetParameterValue (['engine', 'driver'], driver)
|
||||
|
||||
def read_container (self, path):
|
||||
is_leaf, children = self.iface.ReadContainer (path)
|
||||
|
|
|
@ -84,12 +84,6 @@ class manager:
|
|||
return proxy and proxy.is_available()
|
||||
|
||||
def jack_start(self):
|
||||
if not self.get_jack_configure().get_selected_driver():
|
||||
dlg = gtk.MessageDialog(None, gtk.DIALOG_MODAL, gtk.MESSAGE_ERROR, gtk.BUTTONS_CLOSE, "JACK has no driver selected. Configure JACK first!")
|
||||
dlg.set_title("Cannot start JACK server")
|
||||
dlg.run()
|
||||
dlg.destroy()
|
||||
return
|
||||
# This has nothing to do here... I suppose
|
||||
# self.set_starting_status()
|
||||
self.get_jack_controller().start()
|
||||
|
|
Loading…
Reference in New Issue