Loading/Saving of sessions containing MIDI tracks and/or busses

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

6 files changed, 33 insertions, 8 deletions

diff --git a/gtk2_ardour/ardour.colors b/gtk2_ardour/ardour.colors
index 6156014f63..50f9460b3c 100644
--- a/gtk2_ardour/ardour.colors
+++ b/gtk2_ardour/ardour.colors
@@ -1,7 +1,7 @@
 cWaveForm 0.0 0.0 0.0 0.80
 cMutedWaveForm 0.35 0.35 0.35 1.0
-cSelectedFrameBase 0.71 0.57 0.66 1.0
-cFrameBase 0.75 0.75 0.76 1.0
+cSelectedFrameBase 0.0 0.57 0.66 0.5
+cFrameBase 0.0 0.76 0.75 0.5
 cAudioTrackBase 0.75 0.75 0.85 0.41
 cAudioTrackOutline 0.00 0.00 0.00 1.00
 cAudioBusBase 0.75 0.80 0.75 0.41
diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc
index 3686a1b0b6..e43013a98e 100644
--- a/gtk2_ardour/ardour2_ui.rc
+++ b/gtk2_ardour/ardour2_ui.rc
@@ -517,7 +517,7 @@ style "audio_bus_base"
   font_name = "sans 6"
   fg[NORMAL] = { 0.77, 0.77, 0.72 }	
   fg[NORMAL] = { 0.7, 0.8, 0.2 }	
-  bg[NORMAL] = {0, 0.36, 0.40 }	
+  bg[NORMAL] = {0, 0.40, 0.36 }	
 }
 
 style "midi_track_base" = "default_base"
@@ -1028,13 +1028,19 @@ widget "*BBTRuler" style "editor_time_ruler"
 widget "*FramesRuler" style "editor_time_ruler"
 widget "*MinSecRuler" style "editor_time_ruler"
 widget "*BaseFrame" style "base_frame"
+widget "*BusControlsBaseUnselected" style "audio_bus_base"
+widget "*AudioTimeAxisViewControlsBaseUnselected" style "audio_track_base"
 widget "*AudioTrackStripBase" style "audio_track_base"
-widget "*TimeAxisViewControlsBaseUnselected" style "audio_track_base"
 widget "*AudioTrackControlsBaseUnselected" style "audio_track_base"
 widget "*AudioTrackFader" style "audio_track_base"
 widget "*AudioBusStripBase" style "audio_bus_base"
-widget "*BusControlsBaseUnselected" style "audio_bus_base"
 widget "*AudioBusFader" style "audio_bus_base"
+widget "*MidiTimeAxisViewControlsBaseUnselected" style "midi_track_base"
+widget "*MidiTrackStripBase" style "midi_track_base"
+widget "*MidiTrackControlsBaseUnselected" style "midi_track_base"
+widget "*MidiTrackFader" style "midi_track_base"
+widget "*MidiBusStripBase" style "midi_bus_base"
+widget "*MidiBusFader" style "midi_bus_base"
 widget "*TrackSeparator" style "track_separator"
 widget "*TrackEditIndicator0*" style "edit_group_0"
 widget "*TrackEditIndicator1*" style "edit_group_1"
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index f7c9093fe7..1c0b920c13 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -157,6 +157,12 @@ AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session& sess, Route& rt
 	visual_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::visual_click));
 	hide_button.signal_clicked().connect (mem_fun(*this, &AudioTimeAxisView::hide_click));
 
+	// FIXME: hack (pretty colours)
+	if (is_audio_track())
+		controls_ebox.set_name ("AudioTimeAxisViewControlsBaseUnselected");
+	else
+		controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected");
+
 	if (is_audio_track()) {
 		controls_table.attach (*rec_enable_button, 5, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 0, 0);
 	}
diff --git a/gtk2_ardour/color_manager.cc b/gtk2_ardour/color_manager.cc
index 2f1a286467..91a12dbf9f 100644
--- a/gtk2_ardour/color_manager.cc
+++ b/gtk2_ardour/color_manager.cc
@@ -79,6 +79,8 @@ ColorManager::load (string path)
 		return -1;
 	}
 
+	cerr << "Loading color definition file " << path << endl;
+
 	while (in) {
 		string name;
 		double r, g, b, a;
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 49622a8dce..997259a875 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1170,7 +1170,18 @@ MixerStrip::route_active_changed ()
 {
 	RouteUI::route_active_changed ();
 
-	if (is_audio_track()) {
+	// FIXME: MIDI/Audio bus distinction
+	
+	if (is_midi_track()) {
+		if (_route.active()) {
+			set_name ("MidiTrackStripBase");
+			gpm.set_meter_strip_name ("MidiTrackStripBase");
+		} else {
+			set_name ("MidiTrackStripBaseInactive");
+			gpm.set_meter_strip_name ("MidiTrackStripBaseInactive");
+		}
+		gpm.set_fader_name ("MidiTrackFader");
+	} else if (is_audio_track()) {
 		if (_route.active()) {
 			set_name ("AudioTrackStripBase");
 			gpm.set_meter_strip_name ("AudioTrackStripBase");
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index b5ab5baa10..fc388a4b2b 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -131,8 +131,8 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
 
 	controls_vbox.pack_start (controls_table, false, false);
 	controls_vbox.show ();
-
-	controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
+	
+	//controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
 	controls_ebox.add (controls_vbox);
 	controls_ebox.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|SCROLL_MASK);
 	controls_ebox.set_flags (CAN_FOCUS);