X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_time_axis.cc;h=4459afa799a2aefc35cd0134228032cd2a2c0c93;hb=d26aac90204a87e00ea3b2cb622a7f5729bfbc4a;hp=01eda95d15aab936673f3c5c32561f66a30f4729;hpb=0d66a38e7520cde225b0410e595bf31ff801a4c1;p=ardour.git

diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 01eda95d15..4459afa799 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -42,7 +42,6 @@
 #include "ardour/panner_shell.h"
 
 #include "ardour_button.h"
-#include "ardour_ui.h"
 #include "audio_time_axis.h"
 #include "automation_line.h"
 #include "enums.h"
@@ -56,7 +55,7 @@
 #include "audio_streamview.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -66,7 +65,7 @@ using namespace Gtk;
 using namespace Editing;
 
 AudioTimeAxisView::AudioTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
-	: AxisView(sess)
+	: SessionHandlePtr (sess)
 	, RouteTimeAxisView(ed, sess, canvas)
 {
 }
@@ -106,6 +105,10 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 		create_automation_child (GainAutomation, false);
 	}
 
+	if (automation_child (TrimAutomation) == 0) {
+		create_automation_child (TrimAutomation, false);
+	}
+
 	/* if set_state above didn't create a mute automation child, we need to make one */
 	if (automation_child (MuteAutomation) == 0) {
 		create_automation_child (MuteAutomation, false);
@@ -180,14 +183,14 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 	AutomationTracks::iterator existing = _automation_tracks.find (param);
 
 	if (existing != _automation_tracks.end()) {
-		
+
 		/* automation track created because we had existing data for
 		 * the processor, but visibility may need to be controlled
 		 * since it will have been set visible by default.
 		 */
 
 		existing->second->set_marked_for_display (show);
-		
+
 		if (!no_redraw) {
 			request_redraw ();
 		}
@@ -199,6 +202,10 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 
 		create_gain_automation_child (param, show);
 
+	} else if (param.type() == TrimAutomation) {
+
+		create_trim_automation_child (param, show);
+
 	} else if (param.type() == PanWidthAutomation ||
                    param.type() == PanElevationAutomation ||
                    param.type() == PanAzimuthAutomation) {
@@ -212,7 +219,7 @@ AudioTimeAxisView::create_automation_child (const Evoral::Parameter& param, bool
 	} else if (param.type() == MuteAutomation) {
 
 		create_mute_automation_child (param, show);
-		
+
 
 	} else {
 		error << "AudioTimeAxisView: unknown automation child " << EventTypeMap::instance().to_symbol(param) << endmsg;
@@ -300,7 +307,7 @@ AudioTimeAxisView::update_control_names ()
 		}
 	}
 
-	if (get_selected()) {
+	if (selected()) {
 		controls_ebox.set_name (controls_base_selected_name);
 		time_axis_frame.set_name (controls_base_selected_name);
 	} else {