X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fio_selector.cc;h=16576a0b8ff358a8bdffe0b04e4a0aa4f622d050;hb=e11b3f90c2d02735a071d526d67cfd0de90cbac3;hp=b097e8966bfca5670a48942221c8c247195f965e;hpb=45d3ec1437cf661533bc7750c623865def4424df;p=ardour.git diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index b097e8966b..16576a0b8f 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2003 Paul Davis + Copyright (C) 2002-2007 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,210 +17,193 @@ */ -#include -#include - -#include - #include - -#include - -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include "utils.h" +#include +#include "ardour/session.h" +#include "ardour/io.h" +#include "ardour/audioengine.h" +#include "ardour/track.h" +#include "ardour/audio_track.h" +#include "ardour/midi_track.h" +#include "ardour/data_type.h" + #include "io_selector.h" -#include "keyboard.h" +#include "utils.h" #include "gui_thread.h" - #include "i18n.h" -using namespace std; -using namespace Gtk; -using namespace Glib; -using namespace sigc; using namespace ARDOUR; -using namespace PBD; -using namespace Gtkmm2ext; - -IOSelectorWindow::IOSelectorWindow (Session& sess, boost::shared_ptr ior, bool input, bool can_cancel) - : ArdourDialog ("i/o selector"), - _selector (sess, ior, input), - ok_button (can_cancel ? _("OK"): _("Close")), - cancel_button (_("Cancel")), - rescan_button (_("Rescan")) +using namespace Gtk; +IOSelector::IOSelector (ARDOUR::Session& session, boost::shared_ptr io, bool offer_inputs) + : PortMatrix ( + session, io->default_type(), !offer_inputs, + PortGroupList::Mask (PortGroupList::BUSS | PortGroupList::SYSTEM | PortGroupList::OTHER) + ), + _io (io) { - add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK); - set_name ("IOSelectorWindow"); - - string title; - if (input) { - title = string_compose(_("%1 input"), ior->name()); - } else { - title = string_compose(_("%1 output"), ior->name()); - } - - ok_button.set_name ("IOSelectorButton"); - cancel_button.set_name ("IOSelectorButton"); - rescan_button.set_name ("IOSelectorButton"); - - button_box.set_spacing (5); - button_box.set_border_width (5); - button_box.set_homogeneous (true); - button_box.pack_start (rescan_button); - - if (can_cancel) { - button_box.pack_start (cancel_button); + /* Listen for ports changing on the IO */ + if (_offer_inputs) { + _io->input_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); } else { - cancel_button.hide(); + _io->output_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); } - - button_box.pack_start (ok_button); - get_vbox()->pack_start (_selector); - get_vbox()->pack_start (button_box, false, false); + /* this got lost in a merge from 2.0 */ - ok_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::accept)); - cancel_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::cancel)); - rescan_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::rescan)); - - set_title (title); - set_position (WIN_POS_MOUSE); + // set_button_sensitivity (); + // io->name_changed.connect (mem_fun(*this, &IOSelector::name_changed)); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast (this))); -} - -IOSelectorWindow::~IOSelectorWindow() -{ } void -IOSelectorWindow::rescan () +IOSelector::ports_changed (ARDOUR::IOChange change, void *src) { - _selector.redisplay (); -} + ENSURE_GUI_THREAD (bind (mem_fun (*this, &IOSelector::ports_changed), change, src)); -void -IOSelectorWindow::cancel () -{ - _selector.Finished(IOSelector::Cancelled); - hide (); + redisplay (); } -void -IOSelectorWindow::accept () -{ - _selector.Finished(IOSelector::Accepted); - hide (); -} + void -IOSelectorWindow::on_map () +IOSelector::set_state (int r, std::string const & p, bool s) { - _selector.redisplay (); - Window::on_map (); + if (s) { + if (!_offer_inputs) { + _io->connect_input (_io->input(r), p, 0); + } else { + _io->connect_output (_io->output(r), p, 0); + } + } else { + if (!_offer_inputs) { + _io->disconnect_input (_io->input(r), p, 0); + } else { + _io->disconnect_output (_io->output(r), p, 0); + } + } } -/************************* - The IO Selector "widget" - *************************/ - -IOSelector::IOSelector (Session& sess, boost::shared_ptr ior, bool input) - : session (sess), - io (ior), - for_input (input), - port_frame (for_input? _("Inputs") : _("Outputs")), - add_port_button (for_input? _("Add Input") : _("Add Output")), - remove_port_button (for_input? _("Remove Input") : _("Remove Output")), - clear_connections_button (_("Disconnect All")) +bool +IOSelector::get_state (int r, std::string const & p) const { - selected_port = 0; + vector connections; - notebook.set_name ("IOSelectorNotebook"); - notebook.set_size_request (-1, 125); - - clear_connections_button.set_name ("IOSelectorButton"); - add_port_button.set_name ("IOSelectorButton"); - remove_port_button.set_name ("IOSelectorButton"); + if (_offer_inputs) { + _io->output(r)->get_connections (connections); + } else { + _io->input(r)->get_connections (connections); + } - selector_frame.set_name ("IOSelectorFrame"); - port_frame.set_name ("IOSelectorFrame"); + int k = 0; + for (vector::iterator i = connections.begin(); i != connections.end(); ++i) { - selector_frame.set_label (_("Available connections")); - - selector_button_box.set_spacing (5); - selector_button_box.set_border_width (5); + if ((*i)== p) { + return true; + } + + ++k; + } - selector_box.set_spacing (5); - selector_box.set_border_width (5); - selector_box.pack_start (notebook); - selector_box.pack_start (selector_button_box, false, false); + return false; +} - selector_frame.add (selector_box); +uint32_t +IOSelector::n_rows () const +{ + if (!_offer_inputs) { + return _io->inputs().num_ports (_io->default_type()); + } else { + return _io->outputs().num_ports (_io->default_type()); + } +} - port_box.set_spacing (5); - port_box.set_border_width (5); +uint32_t +IOSelector::maximum_rows () const +{ + if (!_offer_inputs) { + return _io->input_maximum ().get (_io->default_type()); + } else { + return _io->output_maximum ().get (_io->default_type()); + } +} - port_display_scroller.set_name ("IOSelectorNotebook"); - port_display_scroller.set_border_width (0); - port_display_scroller.set_size_request (-1, 170); - port_display_scroller.add (port_box); - port_display_scroller.set_policy (POLICY_NEVER, - POLICY_AUTOMATIC); - port_button_box.set_spacing (5); - port_button_box.set_border_width (5); +uint32_t +IOSelector::minimum_rows () const +{ + if (!_offer_inputs) { + return _io->input_minimum ().get (_io->default_type()); + } else { + return _io->output_minimum ().get (_io->default_type()); + } +} - port_button_box.pack_start (add_port_button, false, false); - port_button_box.pack_start (remove_port_button, false, false); - port_button_box.pack_start (clear_connections_button, false, false); +std::string +IOSelector::row_name (int r) const +{ + if (!_offer_inputs) { + return _io->input(r)->name(); + } else { + return _io->output(r)->name(); + } + +} - port_and_button_box.set_border_width (5); - port_and_button_box.pack_start (port_button_box, false, false); - port_and_button_box.pack_start (port_display_scroller); +void +IOSelector::add_row () +{ + // The IO selector only works for single typed IOs + const ARDOUR::DataType t = _io->default_type (); - port_frame.add (port_and_button_box); + if (!_offer_inputs) { - port_and_selector_box.set_spacing (5); - port_and_selector_box.pack_start (port_frame); - port_and_selector_box.pack_start (selector_frame); + try { + _io->add_input_port ("", this); + } - set_spacing (5); - set_border_width (5); - pack_start (port_and_selector_box); + catch (AudioEngine::PortRegistrationFailure& err) { + MessageDialog msg (_("There are no more JACK ports available.")); + msg.run (); + } - rescan(); - display_ports (); + } else { - clear_connections_button.signal_clicked().connect (mem_fun(*this, &IOSelector::clear_connections)); + try { + _io->add_output_port ("", this); + } - add_port_button.signal_clicked().connect (mem_fun(*this, &IOSelector::add_port)); - remove_port_button.signal_clicked().connect (mem_fun(*this, &IOSelector::remove_port)); + catch (AudioEngine::PortRegistrationFailure& err) { + MessageDialog msg (_("There are no more JACK ports available.")); + msg.run (); + } + } +} - if (for_input) { - io->input_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); +void +IOSelector::remove_row (int r) +{ + // The IO selector only works for single typed IOs + const ARDOUR::DataType t = _io->default_type (); + + if (!_offer_inputs) { + _io->remove_input_port (_io->input (r), this); } else { - io->output_changed.connect (mem_fun(*this, &IOSelector::ports_changed)); + _io->remove_output_port (_io->output (r), this); } - - io->name_changed.connect (mem_fun(*this, &IOSelector::name_changed)); } -IOSelector::~IOSelector () +std::string +IOSelector::row_descriptor () const { + return _("port"); } +#if 0 void IOSelector::set_button_sensitivity () { @@ -257,8 +240,9 @@ IOSelector::set_button_sensitivity () } } } +#endif - +#if 0 void IOSelector::name_changed (void* src) { @@ -266,482 +250,121 @@ IOSelector::name_changed (void* src) display_ports (); } +#endif + +IOSelectorWindow::IOSelectorWindow ( + ARDOUR::Session& session, boost::shared_ptr io, bool for_input, bool can_cancel + ) + : ArdourDialog ("I/O selector"), + _selector (session, io, !for_input), + ok_button (can_cancel ? _("OK"): _("Close")), + cancel_button (_("Cancel")), + rescan_button (_("Rescan")) -void -IOSelector::clear_connections () { + add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK); + set_name ("IOSelectorWindow2"); + + string title; if (for_input) { - io->disconnect_inputs (this); + title = string_compose(_("%1 input"), io->name()); } else { - io->disconnect_outputs (this); + title = string_compose(_("%1 output"), io->name()); } -} -void -IOSelector::rescan () -{ - using namespace Notebook_Helpers; - - typedef std::map > > PortMap; - PortMap portmap; - const char **ports; - PageList& pages = notebook.pages(); - gint current_page; - vector rowdata; - - page_selection_connection.disconnect (); - - current_page = notebook.get_current_page (); - - pages.clear (); - - /* get relevant current JACK ports */ - - ports = session.engine().get_ports ("", JACK_DEFAULT_AUDIO_TYPE, for_input ? JackPortIsOutput : JackPortIsInput); - - if (ports == 0) { - return; + ok_button.set_name ("IOSelectorButton"); + if (!can_cancel) { + ok_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON))); } + cancel_button.set_name ("IOSelectorButton"); + rescan_button.set_name ("IOSelectorButton"); + rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON))); - /* find all the client names and group their ports into a list-by-client */ - - for (int n = 0; ports[n]; ++n) { - - pair > > newpair; - pair strpair; - pair result; - - string str = ports[n]; - string::size_type pos; - string portname; - - pos = str.find (':'); - - newpair.first = str.substr (0, pos); - portname = str.substr (pos+1); - - result = portmap.insert (newpair); - - strpair.first = portname; - strpair.second = str; + get_action_area()->pack_start (rescan_button, false, false); - result.first->second.push_back (strpair); + if (can_cancel) { + cancel_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CANCEL, Gtk::ICON_SIZE_BUTTON))); + get_action_area()->pack_start (cancel_button, false, false); + } else { + cancel_button.hide(); } - - PortMap::iterator i; - - for (i = portmap.begin(); i != portmap.end(); ++i) { - Box *client_box = manage (new VBox); - TreeView *display = manage (new TreeView); - RefPtr model = ListStore::create (port_display_columns); - ScrolledWindow *scroller = manage (new ScrolledWindow); - - display->set_model (model); - display->append_column (X_("notvisible"), port_display_columns.displayed_name); - display->set_headers_visible (false); - display->get_selection()->set_mode (SELECTION_SINGLE); - display->set_name ("IOSelectorList"); - - for (vector >::iterator s = i->second.begin(); s != i->second.end(); ++s) { - - TreeModel::Row row = *(model->append ()); - - row[port_display_columns.displayed_name] = s->first; - row[port_display_columns.full_name] = s->second; - } - - display->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::port_selection_changed), display)); - Label *tab_label = manage (new Label); + get_action_area()->pack_start (ok_button, false, false); - tab_label->set_name ("IOSelectorNotebookTab"); - tab_label->set_text ((*i).first); - - scroller->add (*display); - scroller->set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC); - - client_box->pack_start (*scroller); - - pages.push_back (TabElem (*client_box, *tab_label)); - } - - notebook.set_current_page (current_page); - page_selection_connection = notebook.signal_show().connect (bind (mem_fun (notebook, &Notebook::set_current_page), current_page)); - selector_box.show_all (); -} - -void -IOSelector::display_ports () -{ - TreeView *firsttview = 0; - TreeView *selected_port_tview = 0; - { - Glib::Mutex::Lock lm (port_display_lock); - Port *port; - uint32_t limit; - - if (for_input) { - limit = io->n_inputs(); - } else { - limit = io->n_outputs(); - } - - for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ) { - - slist::iterator tmp; - - tmp = i; - ++tmp; - - port_box.remove (**i); - delete *i; - port_displays.erase (i); - - i = tmp; - } - - for (uint32_t n = 0; n < limit; ++n) { - - TreeView* tview; - //ScrolledWindow *scroller; - string really_short_name; - - if (for_input) { - port = io->input (n); - } else { - port = io->output (n); - } - - /* we know there is '/' because we put it there */ - - really_short_name = port->short_name(); - really_short_name = really_short_name.substr (really_short_name.find ('/') + 1); - - tview = manage (new TreeView()); - RefPtr port_model = ListStore::create (port_display_columns); - - if (!firsttview) { - firsttview = tview; - } - - tview->set_model (port_model); - tview->append_column (really_short_name, port_display_columns.displayed_name); - tview->get_selection()->set_mode (SELECTION_SINGLE); - tview->set_data (X_("port"), port); - tview->set_headers_visible (true); - tview->set_name (X_("IOSelectorPortList")); - - port_box.pack_start (*tview); - port_displays.insert (port_displays.end(), tview); - - /* now fill the clist with the current connections */ - - const char **connections = port->get_connections (); - - if (connections) { - for (uint32_t c = 0; connections[c]; ++c) { - TreeModel::Row row = *(port_model->append()); - row[port_display_columns.displayed_name] = connections[c]; - row[port_display_columns.full_name] = connections[c]; - } - } - - if (for_input) { - - if (io->input_maximum() == 1) { - selected_port = port; - selected_port_tview = tview; - } else { - if (port == selected_port) { - selected_port_tview = tview; - } - } - - } else { - - if (io->output_maximum() == 1) { - selected_port = port; - selected_port_tview = tview; - } else { - if (port == selected_port) { - selected_port_tview = tview; - } - } - } - - TreeViewColumn* col = tview->get_column (0); - - col->set_clickable (true); - - /* handle button events on the column header ... */ - col->signal_clicked().connect (bind (mem_fun(*this, &IOSelector::select_treeview), tview)); - - /* ... and within the treeview itself */ - tview->signal_button_release_event().connect (bind (mem_fun(*this, &IOSelector::connection_button_release), tview)); - } - - port_box.show_all (); - } - - if (!selected_port_tview) { - selected_port_tview = firsttview; - } - - if (selected_port_tview) { - select_treeview (selected_port_tview); - } -} - -bool -IOSelector::port_selection_changed (GdkEventButton *ev, TreeView* treeview) -{ - TreeModel::iterator i = treeview->get_selection()->get_selected(); - int status; + get_vbox()->set_spacing (8); + get_vbox()->pack_start (_selector); - if (!i) { - return 0; - } + ok_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::accept)); + cancel_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::cancel)); + rescan_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::rescan)); - if (selected_port == 0) { - return 0; - } + set_title (title); + set_position (Gtk::WIN_POS_MOUSE); - ustring other_port_name = (*i)[port_display_columns.full_name]; - - if (for_input) { - if ((status = io->connect_input (selected_port, other_port_name, this)) == 0) { - Port *p = session.engine().get_port_by_name (other_port_name); - p->enable_metering(); - } - } else { - status = io->connect_output (selected_port, other_port_name, this); - } + show_all (); - if (status == 0) { - select_next_treeview (); - } - - treeview->get_selection()->unselect_all(); - return 0; + signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast (this))); } -void -IOSelector::ports_changed (IOChange change, void *src) +IOSelectorWindow::~IOSelectorWindow() { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelector::ports_changed), change, src)); - display_ports (); } void -IOSelector::add_port () +IOSelectorWindow::rescan () { - /* add a new port, then hide the button if we're up to the maximum allowed */ - - if (for_input) { - - try { - io->add_input_port ("", this); - } - - catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (0, _("There are no more JACK ports available.")); - msg.run (); - } - - } else { - - try { - io->add_output_port ("", this); - } - - catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (0, _("There are no more JACK ports available.")); - msg.run (); - } - } - - set_button_sensitivity (); + _selector.redisplay (); } void -IOSelector::remove_port () -{ - uint32_t nports; - - // always remove last port - - if (for_input) { - if ((nports = io->n_inputs()) > 0) { - io->remove_input_port (io->input(nports-1), this); - } - - } else { - if ((nports = io->n_outputs()) > 0) { - io->remove_output_port (io->output(nports-1), this); - } - } - - set_button_sensitivity (); -} - -gint -IOSelector::connection_button_release (GdkEventButton *ev, TreeView *treeview) +IOSelectorWindow::cancel () { - /* this handles button release on a port name row: i.e. a connection - between the named port and the port represented by the treeview. - */ - - Gtk::TreeModel::iterator iter; - TreeModel::Path path; - TreeViewColumn* column; - int cellx; - int celly; - - /* only handle button1 events here */ - - if (ev->button != 1) { - return false; - } - - if (!treeview->get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) { - return false; - } - - if ((iter = treeview->get_model()->get_iter (path.to_string()))) { - - /* path is valid */ - ustring connected_port_name = (*iter)[port_display_columns.full_name]; - Port *port = reinterpret_cast (treeview->get_data (X_("port"))); - - if (for_input) { - Port *p = session.engine().get_port_by_name (connected_port_name); - p->disable_metering(); - io->disconnect_input (port, connected_port_name, this); - } else { - io->disconnect_output (port, connected_port_name, this); - } - } - - return true; + _selector.Finished (IOSelector::Cancelled); + hide (); } void -IOSelector::select_next_treeview () +IOSelectorWindow::accept () { - slist::iterator next; - - if (port_displays.empty() || port_displays.size() == 1) { - return; - } - - for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { - - if ((*i)->get_name() == "IOSelectorPortListSelected") { - - ++i; - - if (i == port_displays.end()) { - select_treeview (port_displays.front()); - } else { - select_treeview (*i); - } - - break; - } - } + _selector.Finished (IOSelector::Accepted); + hide (); } void -IOSelector::select_treeview (TreeView* tview) +IOSelectorWindow::on_map () { - /* Gack. TreeView's don't respond visually to a change - in their state, so rename them to force a style - switch. - */ - - Glib::Mutex::Lock lm (port_display_lock); - Port* port = reinterpret_cast (tview->get_data (X_("port"))); - - selected_port = port; - - tview->set_name ("IOSelectorPortListSelected"); - tview->queue_draw (); - - /* ugly hack to force the column header button to change as well */ - - TreeViewColumn* col = tview->get_column (0); - GtkTreeViewColumn* ccol = col->gobj(); - - if (ccol->button) { - gtk_widget_set_name (ccol->button, "IOSelectorPortListSelected"); - gtk_widget_queue_draw (ccol->button); - } - - for (slist::iterator i = port_displays.begin(); i != port_displays.end(); ++i) { - if (*i == tview) { - continue; - } - - col = (*i)->get_column (0); - ccol = col->gobj(); - - if (ccol->button) { - gtk_widget_set_name (ccol->button, "IOSelectorPortList"); - gtk_widget_queue_draw (ccol->button); - } - - (*i)->set_name ("IOSelectorPortList"); - (*i)->queue_draw (); - } - - selector_box.show_all (); + _selector.redisplay (); + Window::on_map (); } -void -IOSelector::redisplay () -{ - display_ports (); - - if (for_input) { - if (io->input_maximum() != 0) { - rescan (); - } - } else { - if (io->output_maximum() != 0) { - rescan(); - } - } -} -PortInsertUI::PortInsertUI (Session& sess, boost::shared_ptr pi) - : input_selector (sess, pi, true), - output_selector (sess, pi, false) +PortInsertUI::PortInsertUI (ARDOUR::Session& sess, boost::shared_ptr pi) + : input_selector (sess, pi->io(), true), + output_selector (sess, pi->io(), false) { hbox.pack_start (output_selector, true, true); hbox.pack_start (input_selector, true, true); - pack_start (hbox); } void -PortInsertUI::redisplay() +PortInsertUI::redisplay () { - input_selector.redisplay(); output_selector.redisplay(); } void -PortInsertUI::finished(IOSelector::Result r) +PortInsertUI::finished (IOSelector::Result r) { input_selector.Finished (r); output_selector.Finished (r); } -PortInsertWindow::PortInsertWindow (Session& sess, boost::shared_ptr pi, bool can_cancel) +PortInsertWindow::PortInsertWindow (ARDOUR::Session& sess, boost::shared_ptr pi, bool can_cancel) : ArdourDialog ("port insert dialog"), _portinsertui (sess, pi), ok_button (can_cancel ? _("OK"): _("Close")), @@ -755,37 +378,38 @@ PortInsertWindow::PortInsertWindow (Session& sess, boost::shared_ptr set_title (title); ok_button.set_name ("IOSelectorButton"); + if (!can_cancel) { + ok_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON))); + } cancel_button.set_name ("IOSelectorButton"); rescan_button.set_name ("IOSelectorButton"); + rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON))); - button_box.set_spacing (5); - button_box.set_border_width (5); - button_box.set_homogeneous (true); - button_box.pack_start (rescan_button); + get_action_area()->pack_start (rescan_button, false, false); if (can_cancel) { - button_box.pack_start (cancel_button); - } - else { + cancel_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CANCEL, Gtk::ICON_SIZE_BUTTON))); + get_action_area()->pack_start (cancel_button, false, false); + } else { cancel_button.hide(); } - button_box.pack_start (ok_button); + get_action_area()->pack_start (ok_button, false, false); get_vbox()->pack_start (_portinsertui); - get_vbox()->pack_start (button_box, false, false); - ok_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::accept)); - cancel_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::cancel)); - rescan_button.signal_clicked().connect (mem_fun(*this, &PortInsertWindow::rescan)); + ok_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::accept)); + cancel_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::cancel)); + rescan_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::rescan)); signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast (this))); - going_away_connection = pi->GoingAway.connect (mem_fun(*this, &PortInsertWindow::plugin_going_away)); + going_away_connection = pi->GoingAway.connect (mem_fun (*this, &PortInsertWindow::plugin_going_away)); } void PortInsertWindow::plugin_going_away () { - ENSURE_GUI_THREAD(mem_fun(*this, &PortInsertWindow::plugin_going_away)); + ENSURE_GUI_THREAD (mem_fun (*this, &PortInsertWindow::plugin_going_away)); + going_away_connection.disconnect (); delete_when_idle (this); } @@ -801,19 +425,19 @@ PortInsertWindow::on_map () void PortInsertWindow::rescan () { - _portinsertui.redisplay(); + _portinsertui.redisplay (); } void PortInsertWindow::cancel () { - _portinsertui.finished(IOSelector::Cancelled); + _portinsertui.finished (IOSelector::Cancelled); hide (); } void PortInsertWindow::accept () { - _portinsertui.finished(IOSelector::Accepted); + _portinsertui.finished (IOSelector::Accepted); hide (); }