X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fio_selector.cc;h=615ce9d69fae61c2988f027fe31fd0034916aa22;hb=a1e0dc13df3cdc7033c940f0f3311a2bd47d3b2e;hp=94da96573c310b7072cfc4641f5fe98cfcf3818c;hpb=caa305ed2b5f2b5ed976a1e0b18b3794c2ab2465;p=ardour.git

diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc
index 94da96573c..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 <gtkmm2ext/doi.h>
 
-#include <ardour/port_insert.h>
+#include "ardour/port_insert.h"
 #include "ardour/session.h"
 #include "ardour/io.h"
 #include "ardour/audioengine.h"
@@ -30,6 +30,8 @@
 #include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
 #include "ardour/data_type.h"
+#include "ardour/port.h"
+#include "ardour/bundle.h"
 
 #include "io_selector.h"
 #include "utils.h"
@@ -39,285 +41,172 @@
 using namespace ARDOUR;
 using namespace Gtk;
 
-IOSelector::IOSelector (ARDOUR::Session& session, boost::shared_ptr<ARDOUR::IO> io, bool offer_inputs)
-	: PortMatrix (
-		session, io->default_type(), offer_inputs,
-		PortGroupList::Mask (PortGroupList::BUSS | 
-				     PortGroupList::SYSTEM | 
-				     PortGroupList::OTHER)),
-	  _io (io)
+IOSelector::IOSelector (Gtk::Window* p, ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io)
+	: PortMatrix (p, session, io->default_type())
+	, _io (io)
 {
-	/* Listen for ports changing on the IO */
-	if (_offer_inputs) {
-		_io->output_changed.connect (mem_fun(*this, &IOSelector::ports_changed));
+	/* signal flow from 0 to 1 */
+
+	_find_inputs_for_io_outputs = (_io->direction() == IO::Output);
+
+	if (_find_inputs_for_io_outputs) {
+		_other = 1;
+		_ours = 0;
 	} else {
-		_io->input_changed.connect (mem_fun(*this, &IOSelector::ports_changed));
+		_other = 0;
+		_ours = 1;
 	}
-}
 
-void
-IOSelector::ports_changed (ARDOUR::IOChange change, void *src)
-{
-	ENSURE_GUI_THREAD (bind (mem_fun (*this, &IOSelector::ports_changed), change, src));
+	_port_group.reset (new PortGroup (io->name()));
+	_ports[_ours].add_group (_port_group);
 
-	redisplay ();
+	setup_all_ports ();
+	init ();
 }
 
 void
-IOSelector::set_state (int r, std::string const & p, bool s)
-{
-	if (s) {
-		if (!_offer_inputs) {
-			_io->connect_input (_io->input(r), p, 0);
-		} else {
-			_io->connect_output (_io->output(r), p, 0);
-  		}
-  	} else {
-  		if (!_offer_inputs) {
-  			_io->disconnect_input (_io->input(r), p, 0);
-  		} else {
-  			_io->disconnect_output (_io->output(r), p, 0);
-  		}
-  	}
-}
-
-bool
-IOSelector::get_state (int r, std::string const & p) const
+IOSelector::setup_ports (int dim)
 {
-	vector<string> connections;
-
-	if (_offer_inputs) {
-		_io->output(r)->get_connections (connections);
-	} else {
-		_io->input(r)->get_connections (connections);
+	if (!_session) {
+		return;
 	}
+	
+	_ports[dim].suspend_signals ();
 
-	int k = 0;
-	for (vector<string>::iterator i = connections.begin(); i != connections.end(); ++i) {
-
-		if ((*i)== p) {
-			return true;
-		}
-		
-		++k;
-	}
+	if (dim == _other) {
 
-	return false;
-}
+		_ports[_other].gather (_session, _find_inputs_for_io_outputs, false);
 
-uint32_t
-IOSelector::n_rows () const
-{
-	if (!_offer_inputs) {
-		return _io->inputs().num_ports (_io->default_type());
 	} else {
-		return _io->outputs().num_ports (_io->default_type());
-	}
-}
 
-uint32_t
-IOSelector::maximum_rows () const
-{
-	if (!_offer_inputs) {
-		return _io->input_maximum ().get (_io->default_type());
-	} else {
-		return _io->output_maximum ().get (_io->default_type());
+		_port_group->clear ();
+		_port_group->add_bundle (_io->bundle (), _io);
 	}
-}
-
 
-uint32_t
-IOSelector::minimum_rows () const
-{
-	if (!_offer_inputs) {
-		return _io->input_minimum ().get (_io->default_type());
-	} else {
-		return _io->output_minimum ().get (_io->default_type());
-	}
+	_ports[dim].resume_signals ();
 }
 
-std::string
-IOSelector::row_name (int r) const
+void
+IOSelector::set_state (ARDOUR::BundleChannel c[2], bool s)
 {
-	string n;
-	string::size_type pos;
-
-	if (!_offer_inputs) {
-		n =  _io->input(r)->short_name();
-	} else {
-		n = _io->output(r)->short_name();
-	}
-	
-	if ((pos = n.find ('/')) != string::npos) {
-		return n.substr (pos+1);
-	} else {
-		return n;
+	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);
+			if (!f) {
+				return;
+			}
+
+			if (s) {
+				_io->connect (f, *j, 0);
+			} else {
+				_io->disconnect (f, *j, 0);
+			}
+		}
 	}
 }
 
-void
-IOSelector::add_row ()
+PortMatrixNode::State
+IOSelector::get_state (ARDOUR::BundleChannel c[2]) const
 {
-	// The IO selector only works for single typed IOs
-	const ARDOUR::DataType t = _io->default_type ();
+	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 (!_offer_inputs) {
-
-		try {
-			_io->add_input_port ("", this);
-		}
+	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;
+	}
 
-		catch (AudioEngine::PortRegistrationFailure& err) {
-			MessageDialog msg (_("There are no more JACK ports available."));
-			msg.run ();
-		}
+	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) {
 
-	} else {
+			Port* f = _session->engine().get_port_by_name (*i);
 
-		try {
-			_io->add_output_port ("", this);
-		}
+			/* since we are talking about an IO, our ports should all have an associated Port *,
+			   so the above call should never fail */
+			assert (f);
 
-		catch (AudioEngine::PortRegistrationFailure& err) {
-			MessageDialog msg (_("There are no more JACK ports available."));
-			msg.run ();
+			if (!f->connected_to (*j)) {
+				/* if any one thing is not connected, all bets are off */
+				return PortMatrixNode::NOT_ASSOCIATED;
+			}
 		}
 	}
+
+	return PortMatrixNode::ASSOCIATED;
 }
 
-void
-IOSelector::remove_row (int r)
+uint32_t
+IOSelector::n_io_ports () const
 {
-	// The IO selector only works for single typed IOs
-	const ARDOUR::DataType t = _io->default_type ();
-	
-	if (!_offer_inputs) {
-		_io->remove_input_port (_io->input (r), this);
+	if (!_find_inputs_for_io_outputs) {
+		return _io->n_ports().get (_io->default_type());
 	} else {
-		_io->remove_output_port (_io->output (r), this);
+		return _io->n_ports().get (_io->default_type());
 	}
 }
 
-std::string
-IOSelector::row_descriptor () const
+bool
+IOSelector::list_is_global (int dim) const
 {
-	return _("port");
+	return (dim == _other);
 }
 
-IOSelectorWindow::IOSelectorWindow (
-	ARDOUR::Session& session, boost::shared_ptr<ARDOUR::IO> io, bool for_input, bool can_cancel
-	)
-	: ArdourDialog ("I/O selector"),
-	  _selector (session, io, !for_input),
-	  add_button (_("Add Port")),
-	  ok_button (can_cancel ? _("OK"): _("Close")),
-	  cancel_button (_("Cancel")),
-	  rescan_button (_("Rescan"))
-
+IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr<ARDOUR::IO> io, bool /*can_cancel*/)
+	: _selector (this, session, io)
 {
-	add_events (Gdk::KEY_PRESS_MASK | Gdk::KEY_RELEASE_MASK);
 	set_name ("IOSelectorWindow2");
+	set_title (_("I/O selector"));
 
-	// io->name_changed.connect (mem_fun(*this, &IOSelectorWindow::io_name_changed));
-
-	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::mem_fun (_selector, &IOSelector::add_row));
-	} 
-
-	if (!for_input) {
-		io->output_changed.connect (mem_fun(*this, &IOSelectorWindow::ports_changed));
-	} else {
-		io->input_changed.connect (mem_fun(*this, &IOSelectorWindow::ports_changed));
-	}
-
-	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_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();
-	}
-		
-	ok_button.set_name ("IOSelectorButton");
-	if (!can_cancel) {
-		ok_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::CLOSE, Gtk::ICON_SIZE_BUTTON)));
-	}
-	get_action_area()->pack_start (ok_button, false, false);
-
-	get_vbox()->set_spacing (8);
-	get_vbox()->pack_start (_selector);
-
-	ok_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::accept));
-	cancel_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::cancel));
-	rescan_button.signal_clicked().connect (mem_fun(*this, &IOSelectorWindow::rescan));
+	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 (IOChange (0), this);
-	
-	show_all ();
-
-	signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), this));
-}
 
-IOSelectorWindow::~IOSelectorWindow()
-{
-	
-}
+	show_all ();
 
-void
-IOSelectorWindow::ports_changed (ARDOUR::IOChange change, void *src)
-{
-	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::rescan ()
-{
-	_selector.redisplay ();
-}
-
-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.redisplay ();
-	Window::on_map ();
+	Gtk::Window::on_show ();
+	pair<uint32_t, uint32_t> 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());
@@ -326,21 +215,22 @@ IOSelectorWindow::io_name_changed (void* src)
 	set_title (title);
 }
 
-PortInsertUI::PortInsertUI (ARDOUR::Session& sess, boost::shared_ptr<ARDOUR::PortInsert> pi)
-	: input_selector (sess, pi->io(), true),
-	  output_selector (sess, pi->io(), false)
+PortInsertUI::PortInsertUI (Gtk::Window* parent, ARDOUR::Session* sess, boost::shared_ptr<ARDOUR::PortInsert> pi)
+	: input_selector (parent, sess, pi->input())
+	, output_selector (parent, sess, pi->output())
 {
-	hbox.pack_start (output_selector, true, true);
-	hbox.pack_start (input_selector, true, true);
+	output_selector.set_min_height_divisor (2);
+	input_selector.set_min_height_divisor (2);
 
-	pack_start (hbox);
+	pack_start (output_selector, true, true);
+	pack_start (input_selector, true, true);
 }
 
 void
 PortInsertUI::redisplay ()
 {
-	input_selector.redisplay();
-	output_selector.redisplay();
+	input_selector.setup_ports (input_selector.other());
+	output_selector.setup_ports (output_selector.other());
 }
 
 void
@@ -351,28 +241,24 @@ PortInsertUI::finished (IOSelector::Result r)
 }
 
 
-PortInsertWindow::PortInsertWindow (ARDOUR::Session& sess, boost::shared_ptr<ARDOUR::PortInsert> pi, bool can_cancel)
+PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARDOUR::PortInsert> 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);
@@ -383,20 +269,26 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session& sess, boost::shared_ptr<ARD
 
 	get_vbox()->pack_start (_portinsertui);
 
-	ok_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::accept));
-	cancel_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::cancel));
-	rescan_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::rescan));
+	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<Window *> (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);
 }
@@ -409,12 +301,6 @@ PortInsertWindow::on_map ()
 }
 
 
-void
-PortInsertWindow::rescan ()
-{
-	_portinsertui.redisplay ();
-}
-
 void
 PortInsertWindow::cancel ()
 {
@@ -428,3 +314,4 @@ PortInsertWindow::accept ()
 	_portinsertui.finished (IOSelector::Accepted);
 	hide ();
 }
+