diff options
author | Carl Hetherington <carl@carlh.net> | 2007-05-18 15:58:01 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2007-05-18 15:58:01 +0000 |
commit | fd6408e6baf9094d73a4b6c1b5b24455b11124b2 (patch) | |
tree | adf52058c24df24b161116608778eda8e23c1e54 /gtk2_ardour | |
parent | 452daa63710c9e13d8fb47573a2525c5e58ef9f5 (diff) |
Rename ARDOUR::Connection to ARDOUR::Bundle, a few minor cleanups along the way.
git-svn-id: svn://localhost/ardour2/trunk@1882 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 48 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.h | 10 | ||||
-rw-r--r-- | gtk2_ardour/redirect_box.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/redirect_box.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_params_ui.cc | 2 |
5 files changed, 30 insertions, 34 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 1a21464bf5..9225fa6b12 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -42,8 +42,8 @@ #include <ardour/send.h> #include <ardour/insert.h> #include <ardour/ladspa_plugin.h> -#include <ardour/connection.h> -#include <ardour/session_connection.h> +#include <ardour/bundle.h> +#include <ardour/session_bundle.h> #include "ardour_ui.h" #include "ardour_dialog.h" @@ -506,7 +506,7 @@ MixerStrip::output_press (GdkEventButton *ev) citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_output))); citems.push_back (SeparatorElem()); - _session.foreach_connection (this, &MixerStrip::add_connection_to_output_menu); + _session.foreach_bundle (this, &MixerStrip::add_bundle_to_output_menu); output_menu.popup (1, ev->time); break; @@ -568,7 +568,7 @@ MixerStrip::input_press (GdkEventButton *ev) citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input))); citems.push_back (SeparatorElem()); - _session.foreach_connection (this, &MixerStrip::add_connection_to_input_menu); + _session.foreach_bundle (this, &MixerStrip::add_bundle_to_input_menu); input_menu.popup (1, ev->time); break; @@ -580,53 +580,53 @@ MixerStrip::input_press (GdkEventButton *ev) } void -MixerStrip::connection_input_chosen (ARDOUR::Connection *c) +MixerStrip::bundle_input_chosen (ARDOUR::Bundle *c) { if (!ignore_toggle) { try { - _route->use_input_connection (*c, this); + _route->use_input_bundle (*c, this); } catch (AudioEngine::PortRegistrationFailure& err) { - error << _("could not register new ports required for that connection") + error << _("could not register new ports required for that bundle") << endmsg; } } } void -MixerStrip::connection_output_chosen (ARDOUR::Connection *c) +MixerStrip::bundle_output_chosen (ARDOUR::Bundle *c) { if (!ignore_toggle) { try { - _route->use_output_connection (*c, this); + _route->use_output_bundle (*c, this); } catch (AudioEngine::PortRegistrationFailure& err) { - error << _("could not register new ports required for that connection") + error << _("could not register new ports required for that bundle") << endmsg; } } } void -MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c) +MixerStrip::add_bundle_to_input_menu (ARDOUR::Bundle* c) { using namespace Menu_Helpers; - if (dynamic_cast<InputConnection *> (c) == 0) { + if (dynamic_cast<InputBundle *> (c) == 0) { return; } MenuList& citems = input_menu.items(); - if (c->nports() == _route->n_inputs().get_total()) { + if (c->nchannels() == _route->n_inputs().get_total()) { - citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_input_chosen), c))); + citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_input_chosen), c))); - ARDOUR::Connection *current = _route->input_connection(); + ARDOUR::Bundle *current = _route->input_bundle(); if (current == c) { ignore_toggle = true; @@ -637,20 +637,20 @@ MixerStrip::add_connection_to_input_menu (ARDOUR::Connection* c) } void -MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c) +MixerStrip::add_bundle_to_output_menu (ARDOUR::Bundle* c) { using namespace Menu_Helpers; - if (dynamic_cast<OutputConnection *> (c) == 0) { + if (dynamic_cast<OutputBundle *> (c) == 0) { return; } - if (c->nports() == _route->n_outputs().get_total()) { + if (c->nchannels() == _route->n_outputs().get_total()) { MenuList& citems = output_menu.items(); - citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::connection_output_chosen), c))); + citems.push_back (CheckMenuElem (c->name(), bind (mem_fun(*this, &MixerStrip::bundle_output_chosen), c))); - ARDOUR::Connection *current = _route->output_connection(); + ARDOUR::Bundle *current = _route->output_bundle(); if (current == c) { ignore_toggle = true; @@ -705,9 +705,9 @@ MixerStrip::connect_to_pan () void MixerStrip::update_input_display () { - ARDOUR::Connection *c; + ARDOUR::Bundle *c; - if ((c = _route->input_connection()) != 0) { + if ((c = _route->input_bundle()) != 0) { input_label.set_text (c->name()); } else { switch (_width) { @@ -725,9 +725,9 @@ MixerStrip::update_input_display () void MixerStrip::update_output_display () { - ARDOUR::Connection *c; + ARDOUR::Bundle *c; - if ((c = _route->output_connection()) != 0) { + if ((c = _route->output_bundle()) != 0) { output_label.set_text (c->name()); } else { switch (_width) { diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 7e92f83579..02a78575ad 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -69,7 +69,7 @@ namespace ARDOUR { class Insert; class Session; class PortInsert; - class Connection; + class Bundle; class Plugin; } namespace Gtk { @@ -168,13 +168,13 @@ class MixerStrip : public RouteUI, public Gtk::EventBox gint output_press (GdkEventButton *); Gtk::Menu input_menu; - void add_connection_to_input_menu (ARDOUR::Connection *); + void add_bundle_to_input_menu (ARDOUR::Bundle *); Gtk::Menu output_menu; - void add_connection_to_output_menu (ARDOUR::Connection *); + void add_bundle_to_output_menu (ARDOUR::Bundle *); - void connection_input_chosen (ARDOUR::Connection *); - void connection_output_chosen (ARDOUR::Connection *); + void bundle_input_chosen (ARDOUR::Bundle *); + void bundle_output_chosen (ARDOUR::Bundle *); void edit_input_configuration (); void edit_output_configuration (); diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index 96e99e4667..99d7b9735d 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -45,8 +45,6 @@ #include <ardour/send.h> #include <ardour/insert.h> #include <ardour/ladspa_plugin.h> -#include <ardour/connection.h> -#include <ardour/session_connection.h> #include "ardour_ui.h" #include "ardour_dialog.h" diff --git a/gtk2_ardour/redirect_box.h b/gtk2_ardour/redirect_box.h index 88fbd5924d..089542b041 100644 --- a/gtk2_ardour/redirect_box.h +++ b/gtk2_ardour/redirect_box.h @@ -52,7 +52,7 @@ class PluginUIWindow; class RouteRedirectSelection; namespace ARDOUR { - class Connection; + class Bundle; class Insert; class Plugin; class PluginInsert; diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index b5655f0cc9..03e0f2ca03 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -35,8 +35,6 @@ #include <ardour/audio_track.h> #include <ardour/send.h> #include <ardour/insert.h> -#include <ardour/connection.h> -#include <ardour/session_connection.h> #include "route_params_ui.h" #include "keyboard.h" |