X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix.cc;h=0fbbc03fb0a46827f73f644b0a153b46f2ec294c;hb=8b5f990267622100b3a1a7ff6fa346282aca4dda;hp=7125780ccf2a3be8714df48794a6f604a698d226;hpb=cca8b8cda0d25459019bb10a59616fec108b825e;p=ardour.git diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 7125780ccf..0fbbc03fb0 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include "ardour/bundle.h" #include "ardour/types.h" #include "ardour/session.h" @@ -156,7 +157,7 @@ PortMatrix::init () _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, _1), gui_context()); /* Part 3: other stuff */ @@ -178,7 +179,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), ui_bind (&PortMatrix::route_processors_changed, this, _1), gui_context()); + (*i)->processors_changed.connect (_route_connections, invalidator (*this), boost::bind (&PortMatrix::route_processors_changed, this, _1), gui_context()); } } @@ -212,6 +213,7 @@ PortMatrix::setup () _body->setup (); setup_scrollbars (); + update_tab_highlighting (); queue_draw (); } @@ -387,13 +389,6 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) { using namespace Menu_Helpers; - if ((row.bundle && row.bundle->nchannels().n_total() == 0) || (column.bundle && column.bundle->nchannels().n_total() == 0)) { - /* One of the bundles has no channels, which means that it has none of the appropriate type, - and is only being displayed to look pretty. So we don't need to do anything. - */ - return; - } - delete _menu; _menu = new Menu; @@ -417,23 +412,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() @@ -450,10 +447,8 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) if (bc[dim].channel != -1) { add_remove_option (sub, w, bc[dim].channel); } else { - - snprintf (buf, sizeof (buf), _("Remove all")); sub.push_back ( - MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w)) + MenuElem (_("Remove all"), sigc::bind (sigc::mem_fun (*this, &PortMatrix::remove_all_channels), w)) ); if (bc[dim].bundle->nchannels().n_total() > 1) { @@ -468,16 +463,23 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) uint32_t c = count_of_our_type (bc[dim].bundle->nchannels ()); if ((_show_only_bundles && c > 0) || c == 1) { + + /* we're looking just at bundles, or our bundle has only one channel, so just offer + to disassociate all on the bundle. + */ + snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str()); sub.push_back ( - MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_channel), w, bc[dim].channel, dim)) + MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_bundle), w, dim)) ); - - } else { + + } else if (c != 0) { if (bc[dim].channel != -1) { + /* specific channel under the menu, so just offer to disassociate that */ add_disassociate_option (sub, w, dim, bc[dim].channel); - } else if (count_of_our_type (bc[dim].bundle->nchannels()) != 0) { + } else { + /* no specific channel; offer to disassociate all, or any one in particular */ snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str()); sub.push_back ( MenuElem (buf, sigc::bind (sigc::mem_fun (*this, &PortMatrix::disassociate_all_on_bundle), w, dim)) @@ -502,12 +504,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()); _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); } @@ -562,7 +568,7 @@ PortMatrix::disassociate_all_on_channel (boost::weak_ptr bundle, uint32_ for (PortGroup::BundleList::iterator i = a.begin(); i != a.end(); ++i) { for (uint32_t j = 0; j < (*i)->bundle->nchannels().n_total(); ++j) { - if (should_show ((*i)->bundle->channel_type(j))) { + if (!should_show ((*i)->bundle->channel_type(j))) { continue; } @@ -592,13 +598,15 @@ PortMatrix::setup_global_ports () } void -PortMatrix::setup_global_ports_proxy () +PortMatrix::setup_global_ports_proxy (RouteSortOrderKey sk) { - /* 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)); + if (sk == EditorSort) { + /* 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)); + } } void @@ -624,6 +632,11 @@ PortMatrix::toggle_show_only_bundles () _show_only_bundles = !_show_only_bundles; setup (); + + /* The way in which hardware ports are grouped changes depending on the _show_only_bundles + setting, so we need to set things up again now. + */ + setup_all_ports (); } pair @@ -673,7 +686,7 @@ 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); } @@ -684,7 +697,14 @@ PortMatrix::add_channel (boost::shared_ptr b, DataType t) boost::shared_ptr io = io_from_bundle (b); if (io) { - io->add_port ("", this, t); + int const r = io->add_port ("", this, t); + if (r == -1) { + Gtk::MessageDialog msg (_("It is not possible to add a port here, as the first processor in the track or buss cannot " + "support the new configuration." + )); + msg.set_title (_("Cannot add port")); + msg.run (); + } } } @@ -764,6 +784,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); @@ -779,7 +800,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; @@ -941,6 +965,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 @@ -1051,3 +1128,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; +}