X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix.cc;h=40cc80a35014c0fc544b5b66eeb29d7ade40358a;hb=2fd506c07c6e6d590137e8c5c197560827be2bc3;hp=fb7bca79463f12535491dfd4a17366dc59a281dd;hpb=78237f3ac3a7918417cd11b30d25c4afdf9b2108;p=ardour.git diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index fb7bca7946..40cc80a350 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -43,6 +43,7 @@ using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; /** PortMatrix constructor. * @param session Our session. @@ -151,13 +152,13 @@ PortMatrix::init () _session->RouteAdded.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context()); /* and also bundles */ - _session->BundleAdded.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context()); + _session->BundleAddedOrRemoved.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context()); /* and also ports */ _session->engine().PortRegisteredOrUnregistered.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports, this), gui_context()); /* watch for route order keys changing, which changes the order of things in our global ports list(s) */ - _session->RouteOrderKeyChanged.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context()); + Route::SyncOrderKeys.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context()); /* Part 3: other stuff */ @@ -180,6 +181,7 @@ PortMatrix::reconnect_to_routes () boost::shared_ptr routes = _session->get_routes (); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { (*i)->processors_changed.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::route_processors_changed, this, _1), gui_context()); + (*i)->DropReferences.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::routes_changed, this), gui_context()); } } @@ -198,6 +200,7 @@ PortMatrix::route_processors_changed (RouteProcessorChange c) void PortMatrix::routes_changed () { + if (!_session) return; reconnect_to_routes (); setup_global_ports (); } @@ -206,6 +209,11 @@ PortMatrix::routes_changed () void PortMatrix::setup () { + if (!_session) { + _route_connections.drop_connections (); + return; // session went away + } + /* this needs to be done first, as the visible_ports() method uses the notebook state to decide which ports are being shown */ @@ -213,6 +221,7 @@ PortMatrix::setup () _body->setup (); setup_scrollbars (); + update_tab_highlighting (); queue_draw (); } @@ -239,17 +248,26 @@ PortMatrix::setup_scrollbars () { Adjustment* a = _hscroll.get_adjustment (); a->set_lower (0); - a->set_upper (_body->full_scroll_width()); a->set_page_size (_body->alloc_scroll_width()); a->set_step_increment (32); a->set_page_increment (128); + /* Set the adjustment to zero if the size has changed.*/ + if (a->get_upper() != _body->full_scroll_width()) { + a->set_upper (_body->full_scroll_width()); + a->set_value (0); + } + a = _vscroll.get_adjustment (); a->set_lower (0); - a->set_upper (_body->full_scroll_height()); a->set_page_size (_body->alloc_scroll_height()); a->set_step_increment (32); a->set_page_increment (128); + + if (a->get_upper() != _body->full_scroll_height()) { + a->set_upper (_body->full_scroll_height()); + a->set_value (0); + } } /** Disassociate all of our ports from each other */ @@ -327,6 +345,13 @@ PortMatrix::select_arrangement () _vbox.pack_end (_vnotebook, false, false); _vbox.pack_end (_vspacer, true, true); +#define REMOVE_FROM_GTK_PARENT(WGT) if ((WGT).get_parent()) { (WGT).get_parent()->remove(WGT);} + REMOVE_FROM_GTK_PARENT(*_body) + REMOVE_FROM_GTK_PARENT(_vscroll) + REMOVE_FROM_GTK_PARENT(_hscroll) + REMOVE_FROM_GTK_PARENT(_vbox) + REMOVE_FROM_GTK_PARENT(_hbox) + attach (*_body, 2, 3, 1, 2, FILL | EXPAND, FILL | EXPAND); attach (_vscroll, 3, 4, 1, 2, SHRINK); attach (_hscroll, 2, 3, 3, 4, FILL | EXPAND, SHRINK); @@ -346,6 +371,12 @@ PortMatrix::select_arrangement () _vbox.pack_end (_vnotebook, false, false); _vbox.pack_end (_vlabel, false, false); + REMOVE_FROM_GTK_PARENT(*_body) + REMOVE_FROM_GTK_PARENT(_vscroll) + REMOVE_FROM_GTK_PARENT(_hscroll) + REMOVE_FROM_GTK_PARENT(_vbox) + REMOVE_FROM_GTK_PARENT(_hbox) + attach (*_body, 1, 2, 2, 3, FILL | EXPAND, FILL | EXPAND); attach (_vscroll, 3, 4, 2, 3, SHRINK); attach (_hscroll, 1, 2, 3, 4, FILL | EXPAND, SHRINK); @@ -411,23 +442,25 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) boost::weak_ptr w (bc[dim].bundle); - /* Start off with options for the `natural' port type */ - for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { - if (should_show (*i)) { - snprintf (buf, sizeof (buf), _("Add %s %s"), (*i).to_i18n_string(), channel_noun().c_str()); - sub.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::add_channel_proxy), w, *i))); + if (can_add_channels (bc[dim].bundle)) { + /* Start off with options for the `natural' port type */ + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + if (should_show (*i)) { + snprintf (buf, sizeof (buf), _("Add %s %s"), (*i).to_i18n_string(), channel_noun().c_str()); + sub.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::add_channel_proxy), w, *i))); + } } - } - - /* Now add other ones */ - for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { - if (!should_show (*i)) { - snprintf (buf, sizeof (buf), _("Add %s %s"), (*i).to_i18n_string(), channel_noun().c_str()); - sub.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::add_channel_proxy), w, *i))); + + /* Now add other ones */ + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + if (!should_show (*i)) { + snprintf (buf, sizeof (buf), _("Add %s %s"), (*i).to_i18n_string(), channel_noun().c_str()); + sub.push_back (MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::add_channel_proxy), w, *i))); + } } } - if (can_rename_channels (bc[dim].bundle)) { + if (can_rename_channels (bc[dim].bundle) && bc[dim].channel != -1) { snprintf ( buf, sizeof (buf), _("Rename '%s'..."), escape_underscores (bc[dim].bundle->channel_name (bc[dim].channel)).c_str() @@ -501,12 +534,16 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) } items.push_back (MenuElem (_("Rescan"), sigc::mem_fun (*this, &PortMatrix::setup_all_ports))); + items.push_back (CheckMenuElem (_("Show individual ports"), sigc::mem_fun (*this, &PortMatrix::toggle_show_only_bundles))); - CheckMenuItem* i = dynamic_cast (&items.back()); + Gtk::CheckMenuItem* i = dynamic_cast (&items.back()); _inhibit_toggle_show_only_bundles = true; i->set_active (!_show_only_bundles); _inhibit_toggle_show_only_bundles = false; + items.push_back (MenuElem (_("Flip"), sigc::mem_fun (*this, &PortMatrix::flip))); + items.back().set_sensitive (can_flip ()); + _menu->popup (1, t); } @@ -581,6 +618,7 @@ PortMatrix::disassociate_all_on_channel (boost::weak_ptr bundle, uint32_ void PortMatrix::setup_global_ports () { + if (!_session || _session->deletion_in_progress()) return; ENSURE_GUI_THREAD (*this, &PortMatrix::setup_global_ports) for (int i = 0; i < 2; ++i) { @@ -596,7 +634,7 @@ PortMatrix::setup_global_ports_proxy () /* Avoid a deadlock by calling this in an idle handler: see IOSelector::io_changed_proxy for a discussion. */ - + Glib::signal_idle().connect_once (sigc::mem_fun (*this, &PortMatrix::setup_global_ports)); } @@ -677,9 +715,9 @@ PortMatrix::io_from_bundle (boost::shared_ptr b) const } bool -PortMatrix::can_add_channel (boost::shared_ptr b) const +PortMatrix::can_add_channels (boost::shared_ptr b) const { - return io_from_bundle (b); + return io_from_bundle (b) != 0; } void @@ -702,7 +740,7 @@ PortMatrix::add_channel (boost::shared_ptr b, DataType t) bool PortMatrix::can_remove_channels (boost::shared_ptr b) const { - return io_from_bundle (b); + return io_from_bundle (b) != 0; } void @@ -716,7 +754,7 @@ PortMatrix::remove_channel (ARDOUR::BundleChannel b) int const r = io->remove_port (p, this); if (r == -1) { ArdourDialog d (_("Port removal not allowed")); - Label l (_("This port cannot be removed, as the first plugin in the track or buss cannot accept the new number of inputs.")); + Label l (_("This port cannot be removed.\nEither the first plugin in the track or buss cannot accept\nthe new number of inputs or the last plugin has more outputs.")); d.get_vbox()->pack_start (l); d.add_button (Stock::OK, RESPONSE_ACCEPT); d.set_modal (true); @@ -775,6 +813,7 @@ PortMatrix::setup_notebooks () dummy->show (); Label* label = manage (new Label ((*i)->name)); label->set_angle (_arrangement == LEFT_TO_BOTTOM ? 90 : -90); + label->set_use_markup (); label->show (); if (_arrangement == LEFT_TO_BOTTOM) { _vnotebook.prepend_page (*dummy, *label); @@ -790,7 +829,10 @@ PortMatrix::setup_notebooks () for (PortGroupList::List::const_iterator i = _ports[_column_index].begin(); i != _ports[_column_index].end(); ++i) { HBox* dummy = manage (new HBox); dummy->show (); - _hnotebook.append_page (*dummy, (*i)->name); + Label* label = manage (new Label ((*i)->name)); + label->set_use_markup (); + label->show (); + _hnotebook.append_page (*dummy, *label); } _ignore_notebook_page_selected = false; @@ -952,6 +994,59 @@ void PortMatrix::port_connected_or_disconnected () { _body->rebuild_and_draw_grid (); + update_tab_highlighting (); +} + +/** Update the highlighting of tab names to reflect which ones + * have connections. This is pretty inefficient, unfortunately, + * but maybe that doesn't matter too much. + */ +void +PortMatrix::update_tab_highlighting () +{ + if (!_session) { + return; + } + + for (int i = 0; i < 2; ++i) { + + Gtk::Notebook* notebook = row_index() == i ? &_vnotebook : &_hnotebook; + + PortGroupList const * gl = ports (i); + int p = 0; + for (PortGroupList::List::const_iterator j = gl->begin(); j != gl->end(); ++j) { + bool has_connection = false; + PortGroup::BundleList const & bl = (*j)->bundles (); + PortGroup::BundleList::const_iterator k = bl.begin (); + while (k != bl.end()) { + if ((*k)->bundle->connected_to_anything (_session->engine())) { + has_connection = true; + break; + } + ++k; + } + + /* Find the page index that we should update; this is backwards + for the vertical tabs in the LEFT_TO_BOTTOM arrangement. + */ + int page = p; + if (i == row_index() && _arrangement == LEFT_TO_BOTTOM) { + page = notebook->get_n_pages() - p - 1; + } + + Gtk::Label* label = dynamic_cast (notebook->get_tab_label(*notebook->get_nth_page (page))); + string c = label->get_label (); + if (c.length() && c[0] == '<' && !has_connection) { + /* this label is marked up with but shouldn't be */ + label->set_text ((*j)->name); + } else if (c.length() && c[0] != '<' && has_connection) { + /* this label is not marked up with but should be */ + label->set_markup (string_compose ("%1", Glib::Markup::escape_text ((*j)->name))); + } + + ++p; + } + } } string @@ -1052,7 +1147,7 @@ PortMatrix::get_association (PortMatrixNode node) const } - /* NOTREACHED */ + abort(); /* NOTREACHED */ return PortMatrixNode::NOT_ASSOCIATED; } @@ -1062,3 +1157,75 @@ PortMatrix::bundle_with_channels (boost::shared_ptr b) { return b && b->nchannels() != ARDOUR::ChanCount::ZERO; } + +/** See if a `flip' is possible. + * @return If flip is possible, the new (row, column) notebook indices that + * should be selected; otherwise, (-1, -1) + */ +pair +PortMatrix::check_flip () const +{ + /* Look for the row's port group name in the columns */ + + int new_column = 0; + boost::shared_ptr r = visible_ports (_row_index); + PortGroupList::List::const_iterator i = _ports[_column_index].begin(); + while (i != _ports[_column_index].end() && (*i)->name != r->name) { + ++i; + ++new_column; + } + + if (i == _ports[_column_index].end ()) { + return make_pair (-1, -1); + } + + /* Look for the column's port group name in the rows */ + + int new_row = 0; + boost::shared_ptr c = visible_ports (_column_index); + i = _ports[_row_index].begin(); + while (i != _ports[_row_index].end() && (*i)->name != c->name) { + ++i; + ++new_row; + } + + if (i == _ports[_row_index].end ()) { + return make_pair (-1, -1); + } + + if (_arrangement == LEFT_TO_BOTTOM) { + new_row = _ports[_row_index].size() - new_row - 1; + } + + return make_pair (new_row, new_column); +} + +bool +PortMatrix::can_flip () const +{ + return check_flip().first != -1; +} + +/** Flip the column and row pages around, if possible */ +void +PortMatrix::flip () +{ + pair n = check_flip (); + if (n.first == -1) { + return; + } + + _vnotebook.set_current_page (n.first); + _hnotebook.set_current_page (n.second); +} + +bool +PortMatrix::key_press (GdkEventKey* k) +{ + if (k->keyval == GDK_f) { + flip (); + return true; + } + + return false; +}