X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fport_matrix.cc;h=5b747d66935ec0b1ee3fe658e23b75be64e58273;hb=5da5a1c100be8e50aefc464d6d93c5d3eb76a07c;hp=06f869b67593078394d6dfee4d2febabc8979258;hpb=4e8d402fd2f92454c0ce1460e0030020b72c3888;p=ardour.git diff --git a/gtk2_ardour/port_matrix.cc b/gtk2_ardour/port_matrix.cc index 06f869b675..5b747d6693 100644 --- a/gtk2_ardour/port_matrix.cc +++ b/gtk2_ardour/port_matrix.cc @@ -25,6 +25,7 @@ #include #include #include +#include #include "ardour/bundle.h" #include "ardour/types.h" #include "ardour/session.h" @@ -33,6 +34,7 @@ #include "port_matrix.h" #include "port_matrix_body.h" #include "port_matrix_component.h" +#include "ardour_dialog.h" #include "i18n.h" #include "gui_thread.h" #include "utils.h" @@ -46,7 +48,7 @@ using namespace ARDOUR; * @param type Port type that we are handling. */ PortMatrix::PortMatrix (Window* parent, Session* session, DataType type) - : Table (3, 3) + : Table (4, 4) , _parent (parent) , _type (type) , _menu (0) @@ -63,12 +65,9 @@ PortMatrix::PortMatrix (Window* parent, Session* session, DataType type) _body = new PortMatrixBody (this); _body->DimensionsChanged.connect (sigc::mem_fun (*this, &PortMatrix::body_dimensions_changed)); - _vbox.pack_start (_vspacer, false, false); - _vbox.pack_start (_vnotebook, false, false); - _vbox.pack_start (_vlabel, true, true); - _hbox.pack_start (_hspacer, false, false); - _hbox.pack_start (_hnotebook, false, false); - _hbox.pack_start (_hlabel, true, true); + _hbox.pack_end (_hspacer, true, true); + _hbox.pack_end (_hnotebook, false, false); + _hbox.pack_end (_hlabel, false, false); _vnotebook.signal_switch_page().connect (sigc::mem_fun (*this, &PortMatrix::notebook_page_selected)); _vnotebook.property_tab_border() = 4; @@ -86,6 +85,11 @@ PortMatrix::PortMatrix (Window* parent, Session* session, DataType type) _hlabel.set_padding (16, 4); _hlabel.set_name (X_("PortMatrixLabel")); + set_row_spacing (0, 8); + set_col_spacing (0, 8); + set_row_spacing (2, 8); + set_col_spacing (2, 8); + _body->show (); _vbox.show (); _hbox.show (); @@ -152,7 +156,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, this), gui_context()); + _session->RouteOrderKeyChanged.connect (_session_connections, invalidator (*this), boost::bind (&PortMatrix::setup_global_ports_proxy, this), gui_context()); /* Part 3: other stuff */ @@ -289,6 +293,20 @@ PortMatrix::select_arrangement () count_of_our_type (_ports[1].total_channels()) }; + /* XXX: shirley there's an easier way than this */ + + if (_vspacer.get_parent()) { + _vbox.remove (_vspacer); + } + + if (_vnotebook.get_parent()) { + _vbox.remove (_vnotebook); + } + + if (_vlabel.get_parent()) { + _vbox.remove (_vlabel); + } + /* The list with the most channels goes on left or right, so that the most channel names are printed horizontally and hence more readable. However we also maintain notional `signal flow' vaguely from left to right. Subclasses @@ -304,14 +322,15 @@ PortMatrix::select_arrangement () _hlabel.set_label (_("Destinations")); _vlabel.set_angle (90); - attach (*_body, 1, 2, 0, 1); - attach (_vscroll, 2, 3, 0, 1, SHRINK); - attach (_hscroll, 1, 2, 2, 3, FILL | EXPAND, SHRINK); - attach (_vbox, 0, 1, 0, 1, SHRINK); - attach (_hbox, 1, 2, 1, 2, FILL | EXPAND, SHRINK); + _vbox.pack_end (_vlabel, false, false); + _vbox.pack_end (_vnotebook, false, false); + _vbox.pack_end (_vspacer, true, true); - set_col_spacing (0, 4); - set_row_spacing (0, 4); + 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); + attach (_vbox, 1, 2, 1, 2, SHRINK); + attach (_hbox, 2, 3, 2, 3, FILL | EXPAND, SHRINK); } else { @@ -322,14 +341,15 @@ PortMatrix::select_arrangement () _vlabel.set_label (_("Destinations")); _vlabel.set_angle (-90); - attach (*_body, 0, 1, 1, 2); - attach (_vscroll, 2, 3, 1, 2, SHRINK); - attach (_hscroll, 0, 1, 2, 3, FILL | EXPAND, SHRINK); - attach (_vbox, 1, 2, 1, 2, SHRINK); - attach (_hbox, 0, 1, 0, 1, FILL | EXPAND, SHRINK); + _vbox.pack_end (_vspacer, true, true); + _vbox.pack_end (_vnotebook, false, false); + _vbox.pack_end (_vlabel, false, false); - set_col_spacing (1, 4); - set_row_spacing (1, 4); + 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); + attach (_vbox, 2, 3, 2, 3, SHRINK); + attach (_hbox, 1, 2, 1, 2, FILL | EXPAND, SHRINK); } } @@ -389,6 +409,7 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) bool can_add_or_rename = false; + /* 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()); @@ -397,6 +418,15 @@ PortMatrix::popup_menu (BundleChannel column, BundleChannel row, uint32_t t) } } + /* 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))); + can_add_or_rename = true; + } + } + if (can_rename_channels (bc[dim].bundle)) { snprintf ( buf, sizeof (buf), _("Rename '%s'..."), @@ -557,6 +587,16 @@ PortMatrix::setup_global_ports () } } +void +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)); +} + void PortMatrix::setup_all_ports () { @@ -587,8 +627,8 @@ PortMatrix::max_size () const { pair m = _body->max_size (); - m.first += _vscroll.get_width (); - m.second += _hscroll.get_height (); + m.first += _vscroll.get_width () + _vbox.get_width () + 4; + m.second += _hscroll.get_height () + _hbox.get_height () + 4; return m; } @@ -658,7 +698,16 @@ PortMatrix::remove_channel (ARDOUR::BundleChannel b) if (io) { Port* p = io->nth (b.channel); if (p) { - io->remove_port (p, this); + 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.")); + d.get_vbox()->pack_start (l); + d.add_button (Stock::OK, RESPONSE_ACCEPT); + d.set_modal (true); + d.show_all (); + d.run (); + } } } } @@ -720,8 +769,13 @@ PortMatrix::setup_notebooks () _ignore_notebook_page_selected = false; - _vnotebook.set_tab_pos (POS_LEFT); - _hnotebook.set_tab_pos (POS_TOP); + if (_arrangement == TOP_TO_RIGHT) { + _vnotebook.set_tab_pos (POS_RIGHT); + _hnotebook.set_tab_pos (POS_TOP); + } else { + _vnotebook.set_tab_pos (POS_LEFT); + _hnotebook.set_tab_pos (POS_BOTTOM); + } if (h_current_page != -1 && _hnotebook.get_n_pages() > h_current_page) { _hnotebook.set_current_page (h_current_page); @@ -787,6 +841,17 @@ PortMatrix::body_dimensions_changed () _vspacer.hide (); } + int curr_width; + int curr_height; + _parent->get_size (curr_width, curr_height); + + pair m = max_size (); + + /* Don't shrink the window */ + m.first = max (int (m.first), curr_width); + m.second = max (int (m.second), curr_height); + + resize_window_to_proportion_of_monitor (_parent, m.first, m.second); } @@ -874,3 +939,69 @@ PortMatrix::count_of_our_type (ChanCount c) const return c.get (_type); } + +PortMatrixNode::State +PortMatrix::get_association (PortMatrixNode node) const +{ + if (show_only_bundles ()) { + + bool have_off_diagonal_association = false; + bool have_diagonal_association = false; + bool have_diagonal_not_association = false; + + for (uint32_t i = 0; i < node.row.bundle->nchannels().n_total(); ++i) { + + for (uint32_t j = 0; j < node.column.bundle->nchannels().n_total(); ++j) { + + if (!should_show (node.row.bundle->channel_type(i)) || !should_show (node.column.bundle->channel_type(j))) { + continue; + } + + ARDOUR::BundleChannel c[2]; + c[row_index()] = ARDOUR::BundleChannel (node.row.bundle, i); + c[column_index()] = ARDOUR::BundleChannel (node.column.bundle, j); + + PortMatrixNode::State const s = get_state (c); + + switch (s) { + case PortMatrixNode::ASSOCIATED: + if (i == j) { + have_diagonal_association = true; + } else { + have_off_diagonal_association = true; + } + break; + + case PortMatrixNode::NOT_ASSOCIATED: + if (i == j) { + have_diagonal_not_association = true; + } + break; + + default: + break; + } + } + } + + if (have_diagonal_association && !have_off_diagonal_association && !have_diagonal_not_association) { + return PortMatrixNode::ASSOCIATED; + } else if (!have_diagonal_association && !have_off_diagonal_association) { + return PortMatrixNode::NOT_ASSOCIATED; + } + + return PortMatrixNode::PARTIAL; + + } else { + + ARDOUR::BundleChannel c[2]; + c[column_index()] = node.column; + c[row_index()] = node.row; + return get_state (c); + + } + + /* NOTREACHED */ + return PortMatrixNode::NOT_ASSOCIATED; +} +