From 0fb0da82a0d692018f2bc9825359c69971a88a2f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 18 Jul 2009 03:57:01 +0000 Subject: [PATCH] Pull auditioner and click into an ardour group in the matrix. git-svn-id: svn://localhost/ardour2/branches/3.0@5378 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/port_group.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 2e9ef4389d..06011daf9a 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -28,6 +28,7 @@ #include "ardour/midi_track.h" #include "ardour/port.h" #include "ardour/session.h" +#include "ardour/auditioner.h" #include "port_group.h" #include "port_matrix.h" @@ -203,6 +204,7 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) boost::shared_ptr bus (new PortGroup (_("Bus"))); boost::shared_ptr track (new PortGroup (_("Track"))); boost::shared_ptr system (new PortGroup (_("System"))); + boost::shared_ptr ardour (new PortGroup (_("Ardour"))); boost::shared_ptr other (new PortGroup (_("Other"))); /* Find the bundles for routes. We use the RouteBundle class to join @@ -269,6 +271,11 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) } } + /* Ardour stuff */ + + ardour->add_bundle (session.the_auditioner()->output()->bundle()); + ardour->add_bundle (session.click_io()->bundle()); + /* Now find all other ports that we haven't thought of yet */ std::vector extra_system; @@ -288,7 +295,7 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) std::string const p = ports[n]; - if (!system->has_port(p) && !bus->has_port(p) && !track->has_port(p) && !other->has_port(p)) { + if (!system->has_port(p) && !bus->has_port(p) && !track->has_port(p) && !ardour->has_port(p) && !other->has_port(p)) { if (port_has_prefix (p, "system:") || port_has_prefix (p, "alsa_pcm") || @@ -316,6 +323,7 @@ PortGroupList::gather (ARDOUR::Session& session, bool inputs) add_group (system); add_group (bus); add_group (track); + add_group (ardour); add_group (other); emit_changed ();