X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fio_selector.cc;h=aa0d1c57ad55e01ad8b0ed3c23579e2a2374c9e3;hb=c83389b8ec5fef9553a401e6123b7e55702af9e2;hp=963b03ba3f3931d78f1b142acb6c8c5a512a0f22;hpb=7c49119be05c2a0fc324f6a13e91720ac66a5957;p=ardour.git diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 963b03ba3f..aa0d1c57ad 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 @@ -41,7 +41,7 @@ using namespace ARDOUR; using namespace Gtk; -IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session& session, boost::shared_ptr io) +IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr io) : PortMatrix (p, session, io->default_type()) , _io (io) { @@ -57,21 +57,26 @@ IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session& session, boost::shared_ _ours = 1; } - _port_group.reset (new PortGroup ("")); + _port_group.reset (new PortGroup (io->name())); _ports[_ours].add_group (_port_group); - + setup_all_ports (); + init (); } void IOSelector::setup_ports (int dim) { + if (!_session) { + return; + } + _ports[dim].suspend_signals (); if (dim == _other) { - _ports[_other].gather (_session, _find_inputs_for_io_outputs); - + _ports[_other].gather (_session, _find_inputs_for_io_outputs, false); + } else { _port_group->clear (); @@ -90,7 +95,7 @@ IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s) 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; } @@ -113,18 +118,18 @@ IOSelector::get_state (ARDOUR::BundleChannel c[2]) const 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::UNKNOWN; + 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); + 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 PortMatrixNode::NOT_ASSOCIATED; @@ -151,7 +156,7 @@ IOSelector::list_is_global (int dim) const return (dim == _other); } -IOSelectorWindow::IOSelectorWindow (ARDOUR::Session& session, boost::shared_ptr io, bool /*can_cancel*/) +IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr io, bool /*can_cancel*/) : _selector (this, session, io) { set_name ("IOSelectorWindow2"); @@ -165,9 +170,18 @@ IOSelectorWindow::IOSelectorWindow (ARDOUR::Session& session, boost::shared_ptr< show_all (); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), this)); + signal_delete_event().connect (sigc::mem_fun (*this, &IOSelectorWindow::wm_delete)); } +bool +IOSelectorWindow::wm_delete (GdkEventAny* /*event*/) +{ + _selector.Finished (IOSelector::Accepted); + hide (); + return true; +} + + void IOSelectorWindow::on_map () { @@ -181,13 +195,13 @@ IOSelectorWindow::on_show () 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.find_inputs_for_io_outputs()) { @@ -199,13 +213,13 @@ IOSelectorWindow::io_name_changed (void* src) set_title (title); } -PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session& sess, boost::shared_ptr pi) +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); } @@ -225,7 +239,7 @@ PortInsertUI::finished (IOSelector::Result r) } -PortInsertWindow::PortInsertWindow (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 (this, sess, pi), ok_button (can_cancel ? _("OK"): _("Close")), @@ -236,7 +250,7 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session& sess, boost::shared_ptrname(); 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))); @@ -253,19 +267,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 (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast (this))); + signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false); - going_away_connection = pi->GoingAway.connect (mem_fun (*this, &PortInsertWindow::plugin_going_away)); + pi->DropReferences.connect (going_away_connection, boost::bind (&PortInsertWindow::plugin_going_away, this), gui_context()); +} + +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); }