X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmidi_time_axis.cc;h=57cde4af0dd43f57ae6e6dc8cb41fe7e6b7f0b99;hb=cf4b4dea3e38bbddb9a1960fcfd4205bb58c1837;hp=8ff5d56d70b15be3d8f8d363d6252d4228616778;hpb=fe4cc2e0a086be7815ccdcba89655cb3c6aa07bb;p=ardour.git

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 8ff5d56d70..57cde4af0d 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -89,7 +89,7 @@
 
 #include "ardour/midi_track.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
@@ -104,8 +104,8 @@ static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160;
 static const uint32_t KEYBOARD_MIN_HEIGHT = 130;
 
 MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
-	: AxisView(sess) // virtually inherited
-	, RouteTimeAxisView(ed, sess, canvas)
+	: SessionHandlePtr (sess)
+	, RouteTimeAxisView (ed, sess, canvas)
 	, _ignore_signals(false)
 	, _range_scroomer(0)
 	, _piano_roll_header(0)
@@ -169,12 +169,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 	ignore_toggle = false;
 
 	if (is_midi_track()) {
-		controls_ebox.set_name ("MidiTimeAxisViewControlsBaseUnselected");
-		time_axis_frame.set_name ("MidiTimeAxisViewControlsBaseUnselected");
 		_note_mode = midi_track()->note_mode();
-	} else { // MIDI bus (which doesn't exist yet..)
-		controls_ebox.set_name ("MidiBusControlsBaseUnselected");
-		time_axis_frame.set_name ("MidiBusControlsBaseUnselected");
 	}
 
 	/* if set_state above didn't create a gain automation child, we need to make one */
@@ -193,7 +188,7 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 
 	/* map current state of the route */
 	ensure_pan_views (false);
-
+	update_control_names();
 	processors_changed (RouteProcessorChange ());
 
 	_route->processors_changed.connect (*this, invalidator (*this),
@@ -238,11 +233,6 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
 		time_axis_hbox.pack_end(*v, false, false, 0);
 		midi_scroomer_size_group->add_widget (*v);
 
-		controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
-		time_axis_frame.set_name ("MidiTrackControlsBaseUnselected");
-		controls_base_selected_name = "MidiTrackControlsBaseSelected";
-		controls_base_unselected_name = "MidiTrackControlsBaseUnselected";
-
 		midi_view()->NoteRangeChanged.connect (
 			sigc::mem_fun(*this, &MidiTimeAxisView::update_range));
 
@@ -1287,32 +1277,37 @@ void
 MidiTimeAxisView::route_active_changed ()
 {
 	RouteUI::route_active_changed ();
+	update_control_names();
+}
 
+void
+MidiTimeAxisView::update_control_names ()
+{
 	if (is_track()) {
 		if (_route->active()) {
-			controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
-			time_axis_frame.set_name ("MidiTrackControlsBaseUnselected");
 			controls_base_selected_name = "MidiTrackControlsBaseSelected";
 			controls_base_unselected_name = "MidiTrackControlsBaseUnselected";
 		} else {
-			controls_ebox.set_name ("MidiTrackControlsBaseInactiveUnselected");
-			time_axis_frame.set_name ("MidiTrackControlsBaseInactiveUnselected");
 			controls_base_selected_name = "MidiTrackControlsBaseInactiveSelected";
 			controls_base_unselected_name = "MidiTrackControlsBaseInactiveUnselected";
 		}
-	} else {
+	} else { // MIDI bus (which doesn't exist yet..)
 		if (_route->active()) {
-			controls_ebox.set_name ("BusControlsBaseUnselected");
-			time_axis_frame.set_name ("BusControlsBaseUnselected");
 			controls_base_selected_name = "BusControlsBaseSelected";
 			controls_base_unselected_name = "BusControlsBaseUnselected";
 		} else {
-			controls_ebox.set_name ("BusControlsBaseInactiveUnselected");
-			time_axis_frame.set_name ("BusControlsBaseInactiveUnselected");
 			controls_base_selected_name = "BusControlsBaseInactiveSelected";
 			controls_base_unselected_name = "BusControlsBaseInactiveUnselected";
 		}
 	}
+
+	if (selected()) {
+		controls_ebox.set_name (controls_base_selected_name);
+		time_axis_frame.set_name (controls_base_selected_name);
+	} else {
+		controls_ebox.set_name (controls_base_unselected_name);
+		time_axis_frame.set_name (controls_base_unselected_name);
+	}
 }
 
 void
@@ -1513,7 +1508,7 @@ MidiTimeAxisView::automation_child_menu_item (Evoral::Parameter param)
 }
 
 boost::shared_ptr<MidiRegion>
-MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
+MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit, const int32_t sub_num)
 {
 	Editor* real_editor = dynamic_cast<Editor*> (&_editor);
 	if (commit) {
@@ -1531,8 +1526,9 @@ MidiTimeAxisView::add_region (framepos_t pos, framecnt_t length, bool commit)
 	plist.add (ARDOUR::Properties::name, PBD::basename_nosuffix(src->name()));
 
 	boost::shared_ptr<Region> region = (RegionFactory::create (src, plist));
-
-	playlist()->add_region (region, pos);
+	/* sets beat position */
+	region->set_position (pos, sub_num);
+	playlist()->add_region (region, pos, 1.0, false, sub_num);
 	_session->add_command (new StatefulDiffCommand (playlist()));
 
 	if (commit) {
@@ -1639,12 +1635,12 @@ MidiTimeAxisView::capture_channel_mode_changed ()
 }
 
 bool
-MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx)
+MidiTimeAxisView::paste (framepos_t pos, const Selection& selection, PasteContext& ctx, const int32_t sub_num)
 {
 	if (!_editor.internal_editing()) {
 		// Non-internal paste, paste regions like any other route
-		return RouteTimeAxisView::paste(pos, selection, ctx);
+		return RouteTimeAxisView::paste(pos, selection, ctx, sub_num);
 	}
 
-	return midi_view()->paste(pos, selection, ctx);
+	return midi_view()->paste(pos, selection, ctx, sub_num);
 }