Heavy-duty abstraction work to split type-specific classes into

specializations of (new, for the most part) generic bases.  (eg. most everything
from the MIDI branch except for actual MIDI things, so merges have a chance of
succeeding).  Also the new edit toolbar, and various other cleanup things I did
along the way.

Should be functionally equivalent (except the toolbar), this is just design work.

She's a big'un....



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

1 files changed, 4 insertions, 45 deletions

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 1313fc4082..4f3dc720d9 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -290,8 +290,8 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session& sess, boost::shared_ptr<Route> rt
 	_route->panner().Changed.connect (mem_fun(*this, &MixerStrip::connect_to_pan));
 
 	if (is_audio_track()) {
-		audio_track()->diskstream_changed.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
-		get_diskstream()->speed_changed.connect (mem_fun(*this, &MixerStrip::speed_changed));
+		audio_track()->DiskstreamChanged.connect (mem_fun(*this, &MixerStrip::diskstream_changed));
+		get_diskstream()->SpeedChanged.connect (mem_fun(*this, &MixerStrip::speed_changed));
 	}
 
 	_route->name_changed.connect (mem_fun(*this, &RouteUI::name_changed));
@@ -558,11 +558,6 @@ MixerStrip::input_press (GdkEventButton *ev)
 
 	case 1:
 
-#if ADVANCED_ROUTE_DISKSTREAM_CONNECTIVITY
-	        if (is_audio_track()) {
-		        citems.push_back (MenuElem (_("Track"), mem_fun(*this, &MixerStrip::select_stream_input)));
-		}
-#endif
 		citems.push_back (MenuElem (_("Edit"), mem_fun(*this, &MixerStrip::edit_input_configuration)));
 		citems.push_back (SeparatorElem());
 		citems.push_back (MenuElem (_("Disconnect"), mem_fun (*(static_cast<RouteUI*>(this)), &RouteUI::disconnect_input)));
@@ -660,42 +655,6 @@ MixerStrip::add_connection_to_output_menu (ARDOUR::Connection* c)
 }
 
 void
-MixerStrip::select_stream_input ()
-{
-	using namespace Menu_Helpers;
-
-	Menu *stream_menu = manage (new Menu);
-	MenuList& items = stream_menu->items();
-	stream_menu->set_name ("ArdourContextMenu");
-	
-	Session::AudioDiskstreamList streams = _session.audio_disk_streams();
-
-	for (Session::AudioDiskstreamList::iterator i = streams.begin(); i != streams.end(); ++i) {
-
-		if (!(*i)->hidden()) {
-
-			items.push_back (CheckMenuElem ((*i)->name(), bind (mem_fun(*this, &MixerStrip::stream_input_chosen), *i)));
-			
-			if (get_diskstream() == *i) {
-				ignore_toggle = true;
-				static_cast<CheckMenuItem *> (&items.back())->set_active (true);
-				ignore_toggle = false;
-			} 
-		}
-	}
-	
-	stream_menu->popup (1, 0);
-}
-
-void
-MixerStrip::stream_input_chosen (AudioDiskstream *stream)
-{
-	if (is_audio_track()) {
-		audio_track()->set_diskstream (*stream, this);
-	}
-}
-
-void
 MixerStrip::update_diskstream_display ()
 {
 	if (is_audio_track()) {
@@ -785,7 +744,7 @@ MixerStrip::fast_update ()
 }
 
 void
-MixerStrip::diskstream_changed (void *src)
+MixerStrip::diskstream_changed ()
 {
 	Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
 }	
@@ -1181,7 +1140,7 @@ MixerStrip::route_active_changed ()
 			gpm.set_meter_strip_name ("AudioTrackStripBaseInactive");
 		}
 		gpm.set_fader_name ("AudioTrackFader");
-	} else {
+	} else { // FIXME: assumed audio bus
 		if (_route->active()) {
 			set_name ("AudioBusStripBase");
 			gpm.set_meter_strip_name ("AudioBusStripBase");