Insert/Redirect refactoring, towards better MIDI support in mixer strip, and

http://ardour.org/node/1043 style things.


git-svn-id: svn://localhost/ardour2/trunk@2027 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 8 deletions

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 4efc2b0340..0c99dc7401 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -303,7 +303,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 		get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
 	}
 
-	_route->name_changed.connect (mem_fun(*this, &RouteUI::name_changed));
+	_route->NameChanged.connect (mem_fun(*this, &RouteUI::name_changed));
 	_route->comment_changed.connect (mem_fun(*this, &MixerStrip::comment_changed));
 	_route->gui_changed.connect (mem_fun(*this, &MixerStrip::route_gui_changed));
 
@@ -336,7 +336,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	post_redirect_box.update();
 	mute_changed (0);
 	solo_changed (0);
-	name_changed (0);
+	name_changed ();
 	comment_changed (0);
 	mix_group_changed (0);
 
@@ -469,7 +469,7 @@ MixerStrip::set_width (Width w, void* owner)
 	update_input_display ();
 	update_output_display ();
 	mix_group_changed (0);
-	name_changed (0);
+	name_changed ();
 
 }
 
@@ -1078,11 +1078,11 @@ MixerStrip::set_selected (bool yn)
 }
 
 void
-MixerStrip::name_changed (void *src)
+MixerStrip::name_changed ()
 {
 	switch (_width) {
 	case Wide:
-		RouteUI::name_changed (src);
+		RouteUI::name_changed ();
 		break;
 	case Narrow:
 	        name_label.set_text (PBD::short_version (_route->name(), 5));
@@ -1149,13 +1149,13 @@ MixerStrip::map_frozen ()
 			break;
 		}
 	}
-	_route->foreach_redirect (this, &MixerStrip::hide_redirect_editor);
+	_route->foreach_insert (this, &MixerStrip::hide_insert_editor);
 }
 
 void
-MixerStrip::hide_redirect_editor (boost::shared_ptr<Redirect> redirect)
+MixerStrip::hide_insert_editor (boost::shared_ptr<Insert> insert)
 {
-	void* gui = redirect->get_gui ();
+	void* gui = insert->get_gui ();
 	
 	if (gui) {
 		static_cast<Gtk::Widget*>(gui)->hide ();