X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fio_selector.cc;h=615ce9d69fae61c2988f027fe31fd0034916aa22;hb=a1e0dc13df3cdc7033c940f0f3311a2bd47d3b2e;hp=f438c21d3f354cdc3dd0b79aa671730aff25235a;hpb=d6637dad5a239d74038fdf9e5800e5108ba0c44f;p=ardour.git diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index f438c21d3f..615ce9d69f 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2007 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 @@ -22,7 +22,7 @@ #include -#include +#include "ardour/port_insert.h" #include "ardour/session.h" #include "ardour/io.h" #include "ardour/audioengine.h" @@ -41,326 +41,172 @@ using namespace ARDOUR; 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)) - , _session (session) +IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr io) + : PortMatrix (p, session, io->default_type()) , _io (io) { - /* Listen for ports changing on the IO */ - _io->PortCountChanged.connect (sigc::hide (mem_fun (*this, &IOSelector::ports_changed))); - - setup (); -} + /* signal flow from 0 to 1 */ -void -IOSelector::setup () -{ - _our_bundle = boost::shared_ptr (new ARDOUR::Bundle); - _our_bundle->set_name (_io->name()); - - if (offering_input ()) { - const PortSet& ps (_io->outputs()); - - int j = 0; - for (PortSet::const_iterator i = ps.begin(); i != ps.end(); ++i) { - char buf[32]; - snprintf (buf, sizeof(buf), _("out %d"), j + 1); - _our_bundle->add_channel (buf); - _our_bundle->add_port_to_channel (j, i->name()); - ++j; - } - - } else { - - const PortSet& ps (_io->inputs()); - - int j = 0; - for (PortSet::const_iterator i = ps.begin(); i != ps.end(); ++i) { - char buf[32]; - snprintf (buf, sizeof(buf), _("in %d"), j + 1); - _our_bundle->add_channel (buf); - _our_bundle->add_port_to_channel (j, i->name()); - ++j; - } + _find_inputs_for_io_outputs = (_io->direction() == IO::Output); + if (_find_inputs_for_io_outputs) { + _other = 1; + _ours = 0; + } else { + _other = 0; + _ours = 1; } - PortMatrix::setup (); + _port_group.reset (new PortGroup (io->name())); + _ports[_ours].add_group (_port_group); + + setup_all_ports (); + init (); } void -IOSelector::ports_changed () +IOSelector::setup_ports (int dim) { - ENSURE_GUI_THREAD (mem_fun (*this, &IOSelector::ports_changed)); + if (!_session) { + return; + } + + _ports[dim].suspend_signals (); + + if (dim == _other) { + + _ports[_other].gather (_session, _find_inputs_for_io_outputs, false); - setup (); + } else { + + _port_group->clear (); + _port_group->add_bundle (_io->bundle (), _io); + } + + _ports[dim].resume_signals (); } void -IOSelector::set_state ( - boost::shared_ptr ab, - uint32_t ac, - boost::shared_ptr bb, - uint32_t bc, - bool s, - uint32_t k - ) +IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s) { - ARDOUR::Bundle::PortList const& our_ports = ab->channel_ports (ac); - ARDOUR::Bundle::PortList const& other_ports = bb->channel_ports (bc); + ARDOUR::Bundle::PortList const & our_ports = c[_ours].bundle->channel_ports (c[_ours].channel); + ARDOUR::Bundle::PortList const & other_ports = c[_other].bundle->channel_ports (c[_other].channel); for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) { for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) { - Port* f = _session.engine().get_port_by_name (*i); + Port* f = _session->engine().get_port_by_name (*i); if (!f) { return; } if (s) { - if (!offering_input()) { - _io->connect_input (f, *j, 0); - } else { - _io->connect_output (f, *j, 0); - } + _io->connect (f, *j, 0); } else { - if (!offering_input()) { - _io->disconnect_input (f, *j, 0); - } else { - _io->disconnect_output (f, *j, 0); - } + _io->disconnect (f, *j, 0); } } } } -bool -IOSelector::get_state ( - boost::shared_ptr ab, - uint32_t ac, - boost::shared_ptr bb, - uint32_t bc - ) const +PortMatrixNode::State +IOSelector::get_state (ARDOUR::BundleChannel c[2]) const { - ARDOUR::Bundle::PortList const& our_ports = ab->channel_ports (ac); - ARDOUR::Bundle::PortList const& other_ports = bb->channel_ports (bc); + ARDOUR::Bundle::PortList const & our_ports = c[_ours].bundle->channel_ports (c[_ours].channel); + ARDOUR::Bundle::PortList const & other_ports = c[_other].bundle->channel_ports (c[_other].channel); + + if (our_ports.empty() || other_ports.empty()) { + /* we're looking at a bundle with no parts associated with this channel, + so nothing to connect */ + return PortMatrixNode::NOT_ASSOCIATED; + } for (ARDOUR::Bundle::PortList::const_iterator i = our_ports.begin(); i != our_ports.end(); ++i) { for (ARDOUR::Bundle::PortList::const_iterator j = other_ports.begin(); j != other_ports.end(); ++j) { - Port* f = _session.engine().get_port_by_name (*i); - if (!f) { - return false; - } + Port* f = _session->engine().get_port_by_name (*i); + + /* since we are talking about an IO, our ports should all have an associated Port *, + so the above call should never fail */ + assert (f); if (!f->connected_to (*j)) { /* if any one thing is not connected, all bets are off */ - return false; + return PortMatrixNode::NOT_ASSOCIATED; } } } - return true; -} - -uint32_t -IOSelector::n_rows () const -{ - if (!offering_input()) { - return _io->inputs().num_ports (_io->default_type()); - } else { - return _io->outputs().num_ports (_io->default_type()); - } -} - -uint32_t -IOSelector::maximum_rows () const -{ - if (!offering_input()) { - return _io->input_maximum ().get (_io->default_type()); - } else { - return _io->output_maximum ().get (_io->default_type()); - } + return PortMatrixNode::ASSOCIATED; } - uint32_t -IOSelector::minimum_rows () const -{ - if (!offering_input()) { - return _io->input_minimum ().get (_io->default_type()); - } else { - return _io->output_minimum ().get (_io->default_type()); - } -} - -void -IOSelector::add_channel (boost::shared_ptr b) +IOSelector::n_io_ports () const { - /* we ignore the bundle parameter, as we know what it is that we're adding to */ - - // The IO selector only works for single typed IOs - const ARDOUR::DataType t = _io->default_type (); - - if (!offering_input()) { - - try { - _io->add_input_port ("", this); - } - - catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (_("There are no more JACK ports available.")); - msg.run (); - } - + if (!_find_inputs_for_io_outputs) { + return _io->n_ports().get (_io->default_type()); } else { - - try { - _io->add_output_port ("", this); - } - - catch (AudioEngine::PortRegistrationFailure& err) { - MessageDialog msg (_("There are no more JACK ports available.")); - msg.run (); - } + return _io->n_ports().get (_io->default_type()); } } -void -IOSelector::remove_channel (boost::shared_ptr b, uint32_t c) +bool +IOSelector::list_is_global (int dim) const { - Port* f = _session.engine().get_port_by_name (b->channel_ports(c)[0]); - if (!f) { - return; - } - - if (offering_input()) { - _io->remove_output_port (f, this); - } else { - _io->remove_input_port (f, this); - } + return (dim == _other); } -IOSelectorWindow::IOSelectorWindow (ARDOUR::Session& session, boost::shared_ptr io, bool for_input, bool can_cancel) - : ArdourDialog ("I/O selector") - , _selector (session, io, !for_input) - , add_button (_("Add Port")) - , disconnect_button (_("Disconnect All")) - , ok_button (can_cancel ? _("OK"): _("Close")) - , cancel_button (_("Cancel")) - , rescan_button (_("Rescan")) - +IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr io, bool /*can_cancel*/) + : _selector (this, session, io) { - /* XXX: what's this for? */ - add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK); - set_name ("IOSelectorWindow2"); + set_title (_("I/O selector")); - /* Disconnect All button */ - disconnect_button.set_name ("IOSelectorButton"); - disconnect_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::DISCONNECT, Gtk::ICON_SIZE_BUTTON))); - disconnect_button.signal_clicked().connect (sigc::mem_fun (_selector, &IOSelector::disassociate_all)); - get_action_area()->pack_start (disconnect_button, false, false); - - /* Add Port button */ - if (_selector.maximum_rows() > _selector.n_rows()) { - add_button.set_name ("IOSelectorButton"); - add_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::ADD, Gtk::ICON_SIZE_BUTTON))); - get_action_area()->pack_start (add_button, false, false); - add_button.signal_clicked().connect (sigc::bind (sigc::mem_fun (_selector, &IOSelector::add_channel), boost::shared_ptr ())); - } - - /* Rescan button */ - rescan_button.set_name ("IOSelectorButton"); - rescan_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::REFRESH, Gtk::ICON_SIZE_BUTTON))); - rescan_button.signal_clicked().connect (sigc::mem_fun (_selector, &IOSelector::setup)); - get_action_area()->pack_start (rescan_button, false, false); - - io->PortCountChanged.connect (sigc::hide (mem_fun (*this, &IOSelectorWindow::ports_changed))); - - /* Cancel button */ - if (can_cancel) { - cancel_button.set_name ("IOSelectorButton"); - 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(); - } - cancel_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::cancel)); - - /* OK button */ - ok_button.set_name ("IOSelectorButton"); - if (!can_cancel) { - ok_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON))); - } - ok_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::accept)); - get_action_area()->pack_start (ok_button, false, false); - - get_vbox()->set_spacing (8); - - /* XXX: do we still need the ScrolledWindow? */ - Gtk::ScrolledWindow* sel_scroll = Gtk::manage (new Gtk::ScrolledWindow); - sel_scroll->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER); - sel_scroll->add (_selector); - get_vbox()->pack_start (*sel_scroll, true, true); + Gtk::Alignment* alignment = manage(new Gtk::Alignment(0.5, 0.5, 0.0, 0.0)); + alignment->add (_selector); + add (*alignment); set_position (Gtk::WIN_POS_MOUSE); io_name_changed (this); - ports_changed (); show_all (); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), this)); -} - -IOSelectorWindow::~IOSelectorWindow() -{ - -} - -void -IOSelectorWindow::ports_changed () -{ - if (_selector.maximum_rows() > _selector.n_rows()) { - add_button.set_sensitive (true); - } else { - add_button.set_sensitive (false); - } + signal_delete_event().connect (sigc::mem_fun (*this, &IOSelectorWindow::wm_delete)); } -void -IOSelectorWindow::cancel () +bool +IOSelectorWindow::wm_delete (GdkEventAny* /*event*/) { - _selector.Finished (IOSelector::Cancelled); + _selector.Finished (IOSelector::Accepted); hide (); + return true; } + void -IOSelectorWindow::accept () +IOSelectorWindow::on_map () { - _selector.Finished (IOSelector::Accepted); - hide (); + _selector.setup_all_ports (); + Window::on_map (); } void -IOSelectorWindow::on_map () +IOSelectorWindow::on_show () { - _selector.setup (); - Window::on_map (); + Gtk::Window::on_show (); + pair const pm_max = _selector.max_size (); + resize_window_to_proportion_of_monitor (this, pm_max.first, pm_max.second); } void IOSelectorWindow::io_name_changed (void* src) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelectorWindow::io_name_changed), src)); - + ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src) + string title; - if (!_selector.offering_input()) { + if (!_selector.find_inputs_for_io_outputs()) { title = string_compose(_("%1 input"), _selector.io()->name()); } else { title = string_compose(_("%1 output"), _selector.io()->name()); @@ -369,10 +215,13 @@ IOSelectorWindow::io_name_changed (void* src) set_title (title); } -PortInsertUI::PortInsertUI (ARDOUR::Session& sess, boost::shared_ptr pi) - : input_selector (sess, pi->io(), true), - output_selector (sess, pi->io(), false) +PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::shared_ptr pi) + : input_selector (parent, sess, pi->input()) + , output_selector (parent, sess, pi->output()) { + output_selector.set_min_height_divisor (2); + input_selector.set_min_height_divisor (2); + pack_start (output_selector, true, true); pack_start (input_selector, true, true); } @@ -380,8 +229,8 @@ PortInsertUI::PortInsertUI (ARDOUR::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), + _portinsertui (this, sess, pi), ok_button (can_cancel ? _("OK"): _("Close")), - cancel_button (_("Cancel")), - rescan_button (_("Rescan")) + cancel_button (_("Cancel")) { set_name ("IOSelectorWindow"); string title = _("ardour: "); title += pi->name(); 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))); - get_action_area()->pack_start (rescan_button, false, false); 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); @@ -424,19 +269,26 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session& sess, boost::shared_ptrpack_start (_portinsertui); - ok_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::accept)); - cancel_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::cancel)); + ok_button.signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept)); + cancel_button.signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::cancel)); + + signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast (this))); + pi->DropReferences.connect (going_away_connection, boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context()); +} - going_away_connection = pi->GoingAway.connect (mem_fun (*this, &PortInsertWindow::plugin_going_away)); +bool +PortInsertWindow::wm_delete (GdkEventAny* /*event*/) +{ + accept (); + return true; } void PortInsertWindow::plugin_going_away () { - ENSURE_GUI_THREAD (mem_fun (*this, &PortInsertWindow::plugin_going_away)); - + ENSURE_GUI_THREAD (*this, &PortInsertWindow::plugin_going_away) + going_away_connection.disconnect (); delete_when_idle (this); } @@ -462,3 +314,4 @@ PortInsertWindow::accept () _portinsertui.finished (IOSelector::Accepted); hide (); } +