Split pretty much the entire GUI in 3. Audio and Midi "editor strips" and

associated stuff are now separated (with common things in base classes).

Extremely dirty and in progress, but builds, runs, and audio/midi tracks/busses
all look (and really are) distinct in the GUI.


git-svn-id: svn://localhost/ardour2/branches/midi@691 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 27 insertions, 14 deletions

diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index b18bff46e9..2713a666e4 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -72,14 +72,14 @@ RouteUI::RouteUI (ARDOUR::Route& rt, ARDOUR::Session& sess, const char* m_name,
         mute_button = manage (new BindableToggleButton (_route.mute_control(), m_name ));
         solo_button = manage (new BindableToggleButton (_route.solo_control(), s_name ));
 	
-	if (is_audio_track()) {
-		AudioTrack* at = dynamic_cast<AudioTrack*>(&_route);
+	if (is_track()) {
+		Track* t = dynamic_cast<Track*>(&_route);
 
 		get_diskstream()->RecordEnableChanged.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed));
 
 		_session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed));
 
-		rec_enable_button = manage (new BindableToggleButton (at->rec_enable_control(), r_name ));
+		rec_enable_button = manage (new BindableToggleButton (t->rec_enable_control(), r_name ));
 
 		rec_enable_button->unset_flags (Gtk::CAN_FOCUS);
 		
@@ -270,7 +270,7 @@ RouteUI::solo_release(GdkEventButton* ev)
 gint
 RouteUI::rec_enable_press(GdkEventButton* ev)
 {
-	if (!ignore_toggle && is_audio_track() && rec_enable_button) {
+	if (!ignore_toggle && is_track() && rec_enable_button) {
 
 		if (ev->button == 2 && Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
 			// do nothing on midi bind event
@@ -696,7 +696,7 @@ RouteUI::remove_this_route ()
 	vector<string> choices;
 	string prompt;
 
-	if (is_audio_track()) {
+	if (is_track()) {
 		prompt  = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route.name());
 	} else {
 		prompt  = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route.name());
@@ -872,6 +872,12 @@ RouteUI::disconnect_output ()
 }
 
 bool
+RouteUI::is_track () const
+{
+	return dynamic_cast<Track*>(&_route) != 0;
+}
+
+bool
 RouteUI::is_audio_track () const
 {
 	return dynamic_cast<AudioTrack*>(&_route) != 0;
@@ -883,16 +889,10 @@ RouteUI::is_midi_track () const
 	return dynamic_cast<MidiTrack*>(&_route) != 0;
 }
 
-Diskstream*
-RouteUI::get_diskstream () const
+Track*
+RouteUI::track() const
 {
-	Track *t;
-
-	if ((t = dynamic_cast<Track*>(&_route)) != 0) {
-		return &t->diskstream();
-	} else {
-		return 0;
-	}
+	return dynamic_cast<Track*>(&_route);
 }
 
 AudioTrack*
@@ -907,6 +907,19 @@ RouteUI::midi_track() const
 	return dynamic_cast<MidiTrack*>(&_route);
 }
 
+Diskstream*
+RouteUI::get_diskstream () const
+{
+	Track *t;
+
+	if ((t = dynamic_cast<Track*>(&_route)) != 0) {
+		return &t->diskstream();
+	} else {
+		return 0;
+	}
+}
+
+
 string
 RouteUI::name() const
 {