X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_drag.cc;h=a3b6664e57f4aeb5af57e62e6818861ef3dd4334;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=0dedff5446d01ddb03c3d2233df776d72dab408c;hpb=c5790b1cb60f0c630c52c7cea60c68fcc2387e76;p=ardour.git

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 0dedff5446..a3b6664e57 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -44,7 +44,7 @@
 #include "canvas/scroll_group.h"
 
 #include "editor.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "keyboard.h"
 #include "audio_region_view.h"
 #include "automation_region_view.h"
@@ -510,7 +510,7 @@ Drag::show_verbose_cursor_text (string const & text)
 }
 
 boost::shared_ptr<Region>
-Drag::add_midi_region (MidiTimeAxisView* view, bool commit)
+Drag::add_midi_region (MidiTimeAxisView* view, bool commit, const int32_t sub_num)
 {
 	if (_editor->session()) {
 		const TempoMap& map (_editor->session()->tempo_map());
@@ -519,18 +519,15 @@ Drag::add_midi_region (MidiTimeAxisView* view, bool commit)
 		   might be wrong.
 		*/
 		framecnt_t len = map.frame_at_beat (map.beat_at_frame (pos) + 1.0) - pos;
-		return view->add_region (grab_frame(), len, commit);
+		return view->add_region (grab_frame(), len, commit, sub_num);
 	}
 
 	return boost::shared_ptr<Region>();
 }
 
-struct EditorOrderTimeAxisViewSorter {
+struct PresentationInfoTimeAxisViewSorter {
 	bool operator() (TimeAxisView* a, TimeAxisView* b) {
-		RouteTimeAxisView* ra = dynamic_cast<RouteTimeAxisView*> (a);
-		RouteTimeAxisView* rb = dynamic_cast<RouteTimeAxisView*> (b);
-		assert (ra && rb);
-		return ra->route()->order_key () < rb->route()->order_key ();
+		return a->stripable()->presentation_info().order() < b->stripable()->presentation_info().order();
 	}
 };
 
@@ -546,7 +543,7 @@ RegionDrag::RegionDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<Re
 	*/
 
 	TrackViewList track_views = _editor->track_views;
-	track_views.sort (EditorOrderTimeAxisViewSorter ());
+	track_views.sort (PresentationInfoTimeAxisViewSorter ());
 
 	for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
 		_time_axis_views.push_back (*i);
@@ -846,7 +843,7 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
 
 		RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv);
 		if (!rtv || !rtv->is_track()) {
-			/* ignore busses early on. we can't move any regions on them */
+			/* ignore non-tracks early on. we can't move any regions on them */
 		} else if (_last_pointer_time_axis_view < 0) {
 			/* Was in the drop-zone, now over a track.
 			 * Hence it must be an upward move (from the bottom)
@@ -1259,8 +1256,8 @@ RegionMoveDrag::motion (GdkEvent* event, bool first_move)
 			MidiRegionView* mrv = dynamic_cast<MidiRegionView*>(rv);
 
 			const boost::shared_ptr<const Region> original = rv->region();
-			boost::shared_ptr<Region> region_copy = RegionFactory::create (original, true);
-			region_copy->set_position (original->position());
+			boost::shared_ptr<Region> region_copy = RegionFactory::create (original, true
+										       , _editor->get_grid_music_divisions (event->button.state));
 			/* need to set this so that the drop zone code can work. This doesn't
 			   actually put the region into the playlist, but just sets a weak pointer
 			   to it.
@@ -1367,7 +1364,8 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
 		finished_copy (
 			changed_position,
 			changed_tracks,
-			drag_delta
+			drag_delta,
+			ev->button.state
 			);
 
 	} else {
@@ -1375,7 +1373,8 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
 		finished_no_copy (
 			changed_position,
 			changed_tracks,
-			drag_delta
+			drag_delta,
+			ev->button.state
 			);
 
 	}
@@ -1397,21 +1396,23 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
 			if ((Config->get_output_auto_connect() & AutoConnectMaster) && _editor->session()->master_out()) {
 				output_chan =  _editor->session()->master_out()->n_inputs().n_audio();
 			}
-			audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, ARDOUR::Normal, 0, 1, region->name());
-			RouteTimeAxisView* rtav = _editor->axis_view_from_route (audio_tracks.front());
-			if (rtav) {
-				rtav->set_height (original->current_height());
+			audio_tracks = _editor->session()->new_audio_track (region->n_channels(), output_chan, 0, 1, region->name(), PresentationInfo::max_order);
+			TimeAxisView* tav =_editor->axis_view_from_stripable (audio_tracks.front());
+			if (tav) {
+				tav->set_height (original->current_height());
 			}
-			return rtav;
+			return dynamic_cast<RouteTimeAxisView*>(tav);
 		} else {
 			ChanCount one_midi_port (DataType::MIDI, 1);
 			list<boost::shared_ptr<MidiTrack> > midi_tracks;
-			midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(), ARDOUR::Normal, 0, 1, region->name());
-			RouteTimeAxisView* rtav = _editor->axis_view_from_route (midi_tracks.front());
-			if (rtav) {
-				rtav->set_height (original->current_height());
+			midi_tracks = _editor->session()->new_midi_track (one_midi_port, one_midi_port, boost::shared_ptr<ARDOUR::PluginInfo>(),
+			                                                  (ARDOUR::Plugin::PresetRecord*) 0,
+			                                                  (ARDOUR::RouteGroup*) 0, 1, region->name(), PresentationInfo::max_order);
+			TimeAxisView* tav = _editor->axis_view_from_stripable (midi_tracks.front());
+			if (tav) {
+				tav->set_height (original->current_height());
 			}
-			return rtav;
+			return dynamic_cast<RouteTimeAxisView*> (tav);
 		}
 	} catch (...) {
 		error << _("Could not create new track after region placed in the drop zone") << endmsg;
@@ -1420,7 +1421,7 @@ RegionMoveDrag::create_destination_time_axis (boost::shared_ptr<Region> region,
 }
 
 void
-RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, framecnt_t const drag_delta)
+RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed_tracks*/, framecnt_t const drag_delta, int32_t const ev_state)
 {
 	RegionSelection new_views;
 	PlaylistSet modified_playlists;
@@ -1477,7 +1478,9 @@ RegionMoveDrag::finished_copy (bool const changed_position, bool const /*changed
 		}
 
 		if (dest_rtv != 0) {
-			RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where, modified_playlists);
+			RegionView* new_view = insert_region_into_playlist (i->view->region(), dest_rtv, i->layer, where,
+									    modified_playlists, _editor->get_grid_music_divisions (ev_state));
+
 			if (new_view != 0) {
 				new_views.push_back (new_view);
 			}
@@ -1511,7 +1514,8 @@ void
 RegionMoveDrag::finished_no_copy (
 	bool const changed_position,
 	bool const changed_tracks,
-	framecnt_t const drag_delta
+	framecnt_t const drag_delta,
+	int32_t const ev_state
 	)
 {
 	RegionSelection new_views;
@@ -1572,7 +1576,8 @@ RegionMoveDrag::finished_no_copy (
 			/* insert into new playlist */
 
 			RegionView* new_view = insert_region_into_playlist (
-				RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where, modified_playlists
+				RegionFactory::create (rv->region (), true), dest_rtv, dest_layer, where,
+				modified_playlists, _editor->get_grid_music_divisions (ev_state)
 				);
 
 			if (new_view == 0) {
@@ -1632,7 +1637,7 @@ RegionMoveDrag::finished_no_copy (
 				playlist->freeze ();
 			}
 
-			rv->region()->set_position (where);
+			rv->region()->set_position (where, _editor->get_grid_music_divisions (ev_state));
 			_editor->session()->add_command (new StatefulDiffCommand (rv->region()));
 		}
 
@@ -1735,7 +1740,8 @@ RegionMoveDrag::insert_region_into_playlist (
 	RouteTimeAxisView* dest_rtv,
 	layer_t dest_layer,
 	framecnt_t where,
-	PlaylistSet& modified_playlists
+	PlaylistSet& modified_playlists,
+	const int32_t sub_num
 	)
 {
 	boost::shared_ptr<Playlist> dest_playlist = dest_rtv->playlist ();
@@ -1752,8 +1758,7 @@ RegionMoveDrag::insert_region_into_playlist (
 	if (r.second) {
 		dest_playlist->clear_changes ();
 	}
-
-	dest_playlist->add_region (region, where);
+	dest_playlist->add_region (region, where, 1.0, false, sub_num);
 
 	if (dest_rtv->view()->layer_display() == Stacked || dest_rtv->view()->layer_display() == Expanded) {
 		dest_playlist->set_layer (region, dest_layer);
@@ -1877,7 +1882,7 @@ RegionInsertDrag::RegionInsertDrag (Editor* e, boost::shared_ptr<Region> r, Rout
 }
 
 void
-RegionInsertDrag::finished (GdkEvent *, bool)
+RegionInsertDrag::finished (GdkEvent * event, bool)
 {
 	int pos = _views.front().time_axis_view;
 	assert(pos >= 0 && pos < (int)_time_axis_views.size());
@@ -2304,7 +2309,7 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move)
 {
 	if (first_move) {
 		_editor->begin_reversible_command (_("create region"));
-		_region = add_midi_region (_view, false);
+		_region = add_midi_region (_view, false, _editor->get_grid_music_divisions (event->button.state));
 		_view->playlist()->freeze ();
 	} else {
 		if (_region) {
@@ -2321,16 +2326,16 @@ RegionCreateDrag::motion (GdkEvent* event, bool first_move)
 			*/
 
 			framecnt_t const len = (framecnt_t) fabs ((double)(f - grab_frame () - 1));
-			_region->set_length (len < 1 ? 1 : len);
+			_region->set_length (len < 1 ? 1 : len, _editor->get_grid_music_divisions (event->button.state));
 		}
 	}
 }
 
 void
-RegionCreateDrag::finished (GdkEvent*, bool movement_occurred)
+RegionCreateDrag::finished (GdkEvent* event, bool movement_occurred)
 {
 	if (!movement_occurred) {
-		add_midi_region (_view, true);
+		add_midi_region (_view, true, _editor->get_grid_music_divisions (event->button.state));
 	} else {
 		_view->playlist()->thaw ();
 		_editor->commit_reversible_command();
@@ -2912,7 +2917,9 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
 	switch (_operation) {
 	case StartTrim:
 		for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) {
-			bool changed = i->view->trim_front (i->initial_position + dt, non_overlap_trim);
+			bool changed = i->view->trim_front (i->initial_position + dt, non_overlap_trim
+							    , _editor->get_grid_music_divisions (event->button.state));
+
 			if (changed && _preserve_fade_anchor) {
 				AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
 				if (arv) {
@@ -2930,7 +2937,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move)
 
 	case EndTrim:
 		for (list<DraggingView>::iterator i = _views.begin(); i != _views.end(); ++i) {
-			bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim);
+			bool changed = i->view->trim_end (i->initial_end + dt, non_overlap_trim, _editor->get_grid_music_divisions (event->button.state));
 			if (changed && _preserve_fade_anchor) {
 				AudioRegionView* arv = dynamic_cast<AudioRegionView*> (i->view);
 				if (arv) {
@@ -3115,8 +3122,10 @@ TrimDrag::setup_pointer_frame_offset ()
 }
 
 MeterMarkerDrag::MeterMarkerDrag (Editor* e, ArdourCanvas::Item* i, bool c)
-	: Drag (e, i),
-	  _copy (c)
+	: Drag (e, i)
+	, _copy (c)
+	, _old_snap_type (e->snap_type())
+	, _old_snap_mode (e->snap_mode())
 	, before_state (0)
 {
 	DEBUG_TRACE (DEBUG::Drags, "New MeterMarkerDrag\n");
@@ -3142,12 +3151,7 @@ MeterMarkerDrag::setup_pointer_frame_offset ()
 void
 MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
 {
-	if (!_marker->meter().movable()) {
-		//return;
-	}
-
 	if (first_move) {
-
 		// create a dummy marker to catch events, then hide it.
 
 		char name[64];
@@ -3174,10 +3178,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
 		} else {
 			_editor->begin_reversible_command (_("copy meter mark"));
 
-			Timecode::BBT_Time bbt;
-			map.bbt_time (adjusted_current_frame (event, false), bbt);
-			/* round bbt to bars */
-			map.round_bbt (bbt, -1);
+			Timecode::BBT_Time bbt = _real_section->bbt();
 
 			/* we can't add a meter where one currently exists */
 			if (_real_section->frame() < adjusted_current_frame (event, false)) {
@@ -3185,32 +3186,35 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
 			} else {
 				--bbt.bars;
 			}
-			const double beat = map.bbt_to_beats (bbt);
-
-			if (_real_section->position_lock_style() == AudioTime) {
-				_real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor())
-							       , map.frame_time (bbt), beat, bbt);
-			} else {
-				_real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()), beat, bbt);
+			const double beat = map.beat_at_bbt (bbt);
+			_real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor())
+						       , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style());
+			if (!_real_section) {
+				aborted (true);
+				return;
 			}
+
+		}
+		/* only snap to bars. leave snap mode alone for audio locked meters.*/
+		if (_real_section->position_lock_style() != AudioTime) {
+			_editor->set_snap_to (SnapToBar);
+			_editor->set_snap_mode (SnapNormal);
 		}
 	}
 
-	framepos_t const pf = adjusted_current_frame (event, false);
-	_marker->set_position (pf);
-	if (_marker->meter().position_lock_style() == MusicTime) {
-		TempoMap& map (_editor->session()->tempo_map());
-		Timecode::BBT_Time bbt;
-		map.bbt_time (adjusted_current_frame (event, false), bbt);
-		/* round bbt to bars */
-		map.round_bbt (bbt, -1);
-		const double beat = map.bbt_to_beats (bbt);
-		_editor->session()->tempo_map().gui_move_meter (_real_section, beat);
-	} else {
-		_editor->session()->tempo_map().gui_move_meter (_real_section, pf);
+	framepos_t pf = adjusted_current_frame (event);
+
+	if (_real_section->position_lock_style() == AudioTime && _editor->snap_musical()) {
+		/* never snap to music for audio locked */
+		pf = adjusted_current_frame (event, false);
 	}
-	_marker->set_position (pf);
-	show_verbose_cursor_time (pf);
+
+	_editor->session()->tempo_map().gui_move_meter (_real_section, pf);
+
+	/* fake marker meeds to stay under the mouse, unlike the real one. */
+	_marker->set_position (adjusted_current_frame (event, false));
+
+	show_verbose_cursor_time (_real_section->frame());
 }
 
 void
@@ -3223,6 +3227,10 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 		return;
 	}
 
+	/* reinstate old snap setting */
+	_editor->set_snap_to (_old_snap_type);
+	_editor->set_snap_mode (_old_snap_mode);
+
 	TempoMap& map (_editor->session()->tempo_map());
 
 	XMLNode &after = map.get_state();
@@ -3239,6 +3247,10 @@ MeterMarkerDrag::aborted (bool moved)
 {
 	_marker->set_position (_marker->meter().frame ());
 	if (moved) {
+		/* reinstate old snap setting */
+		_editor->set_snap_to (_old_snap_type);
+		_editor->set_snap_mode (_old_snap_mode);
+
 		_editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version);
 		// delete the dummy marker we used for visual representation while moving.
 		// a new visual marker will show up automatically.
@@ -3273,7 +3285,7 @@ TempoMarkerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 void
 TempoMarkerDrag::setup_pointer_frame_offset ()
 {
-	_pointer_frame_offset = raw_grab_frame() - _marker->tempo().frame();
+	_pointer_frame_offset = raw_grab_frame() - _real_section->frame();
 }
 
 void
@@ -3282,6 +3294,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 	if (!_real_section->active()) {
 		return;
 	}
+
 	if (first_move) {
 
 		// mvc drag - create a dummy marker to catch events, hide it.
@@ -3301,77 +3314,57 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 
 		/* use the new marker for the grab */
 		swap_grab (&_marker->the_item(), 0, GDK_CURRENT_TIME);
+		_marker->hide();
+
+		TempoMap& map (_editor->session()->tempo_map());
+		/* get current state */
+		before_state = &map.get_state();
 
 		if (!_copy) {
 			_editor->begin_reversible_command (_("move tempo mark"));
-			TempoMap& map (_editor->session()->tempo_map());
-			/* get current state */
-			before_state = &map.get_state();
+
+		} else {
+			const Tempo tempo (_marker->tempo());
+			const framepos_t frame = adjusted_current_frame (event) + 1;
+			const TempoSection::Type type = _real_section->type();
+
+			_editor->begin_reversible_command (_("copy tempo mark"));
+
+			if (_real_section->position_lock_style() == MusicTime) {
+				_real_section = map.add_tempo (tempo, map.pulse_at_frame (frame), 0, type, MusicTime);
+			} else {
+				_real_section = map.add_tempo (tempo, 0.0, frame, type, AudioTime);
+			}
+
+			if (!_real_section) {
+				aborted (true);
+				return;
+			}
 		}
-		_marker->hide();
-	}
 
-	framepos_t pf;
-	Tempo const tp = _marker->tempo();
+	}
 
-	if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::constraint_modifier ())) {
+	if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier ())) {
+		/* use vertical movement to alter tempo .. should be log */
 		double new_bpm = _real_section->beats_per_minute() + ((last_pointer_y() - current_pointer_y()) / 5.0);
-		_editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type()));
 		stringstream strs;
+
+		_editor->session()->tempo_map().gui_change_tempo (_real_section, Tempo (new_bpm, _real_section->note_type()));
 		strs << new_bpm;
 		show_verbose_cursor_text (strs.str());
-	} else if (_movable) {
-		if (!_editor->snap_musical()) {
-			pf = adjusted_current_frame (event);
-		} else {
-			bool use_snap;
-			TempoMap& map (_editor->session()->tempo_map());
 
-			pf = adjusted_current_frame (event, false);
-			if (Keyboard::modifier_state_equals (event->button.state, ArdourKeyboard::snap_modifier ())) {
-				if (_editor->snap_mode() == Editing::SnapOff) {
-					use_snap = true;
-				} else {
-					use_snap = false;
-				}
-			} else {
-				if (_editor->snap_mode() == Editing::SnapOff) {
-					use_snap = false;
-				} else {
-					use_snap = true;
-				}
-			}
+	} else if (_movable && !_real_section->locked_to_meter()) {
+		const framepos_t pf = adjusted_current_frame (event);
+		TempoMap& map (_editor->session()->tempo_map());
 
-			Timecode::BBT_Time when;
-			map.bbt_time (pf, when);
+		/* snap to beat is 1, snap to bar is -1 (sorry) */
+		int sub_num = _editor->get_grid_music_divisions (event->button.state);
 
-			if (_real_section->position_lock_style() == MusicTime) {
-
-				const double pulse = map.predict_tempo_pulse (_real_section, pf);
-				when = map.pulse_to_bbt (pulse);
-				if (use_snap && _editor->snap_type() == SnapToBar) {
-					map.round_bbt (when, -1);
-				} else if (use_snap) {
-					map.round_bbt (when, _editor->get_grid_beat_divisions (0));
-				}
-				const double beat = map.bbt_to_beats (when);
-				map.gui_move_tempo_beat (_real_section, beat);
-			} else {
-				if (use_snap && _editor->snap_type() == SnapToBar) {
-					map.round_bbt (when, -1);
-				} else if (use_snap) {
-					map.round_bbt (when, _editor->get_grid_beat_divisions (0));
-				}
-				if (use_snap) {
-					pf = map.predict_tempo_frame (_real_section, when);
-				}
-				map.gui_move_tempo_frame (_real_section, pf);
-			}
-		}
+		map.gui_move_tempo (_real_section, pf, sub_num);
 
 		show_verbose_cursor_time (_real_section->frame());
 	}
-	_marker->set_position (pf);
+	_marker->set_position (adjusted_current_frame (event, false));
 }
 
 void
@@ -3387,38 +3380,11 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 		return;
 	}
 
-
 	TempoMap& map (_editor->session()->tempo_map());
 
-	if (_copy == true) {
-		_editor->begin_reversible_command (_("copy tempo mark"));
-		XMLNode &before = map.get_state();
-
-		if (_marker->tempo().position_lock_style() == MusicTime) {
-			double const pulse = map.predict_tempo_pulse (_real_section, _real_section->frame());
-			map.add_tempo (_marker->tempo(), pulse, _marker->tempo().type());
-		} else {
-			map.add_tempo (_marker->tempo(), _real_section->frame(), _marker->tempo().type());
-		}
-
-		XMLNode &after = map.get_state();
-		_editor->session()->add_command (new MementoCommand<TempoMap>(map, &before, &after));
-		_editor->commit_reversible_command ();
-
-	} else {
-		if (_marker->tempo().position_lock_style() == MusicTime) {
-			double const pulse = map.predict_tempo_pulse (_real_section, _real_section->frame());
-			map.replace_tempo (*_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type())
-					   , pulse, _marker->tempo().type());
-		} else {
-			map.replace_tempo (*_real_section, Tempo (_real_section->beats_per_minute(), _real_section->note_type())
-					   , _real_section->frame(), _marker->tempo().type());
-		}
-
-		XMLNode &after = map.get_state();
-		_editor->session()->add_command (new MementoCommand<TempoMap>(map, before_state, &after));
-		_editor->commit_reversible_command ();
-	}
+	XMLNode &after = map.get_state();
+	_editor->session()->add_command (new MementoCommand<TempoMap>(map, before_state, &after));
+	_editor->commit_reversible_command ();
 
 	// delete the dummy marker we used for visual representation while moving.
 	// a new visual marker will show up automatically.
@@ -3431,18 +3397,112 @@ TempoMarkerDrag::aborted (bool moved)
 	_marker->set_position (_marker->tempo().frame());
 	if (moved) {
 		TempoMap& map (_editor->session()->tempo_map());
-		/* we removed it before, so add it back now */
-		if (_marker->tempo().position_lock_style() == MusicTime) {
-			map.add_tempo (_marker->tempo(), _marker->tempo().pulse(), _marker->tempo().type());
-		} else {
-			map.add_tempo (_marker->tempo(), _marker->tempo().frame(), _marker->tempo().type());
-		}
-		// delete the dummy marker we used for visual representation while moving.
-		// a new visual marker will show up automatically.
+		map.set_state (*before_state, Stateful::current_state_version);
+		// delete the dummy (hidden) marker we used for events while moving.
 		delete _marker;
 	}
 }
 
+BBTRulerDrag::BBTRulerDrag (Editor* e, ArdourCanvas::Item* i)
+	: Drag (e, i)
+	, _pulse (0.0)
+	, _tempo (0)
+	, before_state (0)
+{
+	DEBUG_TRACE (DEBUG::Drags, "New BBTRulerDrag\n");
+
+}
+
+void
+BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
+{
+	Drag::start_grab (event, cursor);
+	TempoMap& map (_editor->session()->tempo_map());
+	_tempo = const_cast<TempoSection*> (&map.tempo_section_at_frame (raw_grab_frame()));
+	ostringstream sstr;
+
+	sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).beats_per_minute() << "\n";
+	sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute();
+	show_verbose_cursor_text (sstr.str());
+	finished (event, false);
+}
+
+void
+BBTRulerDrag::setup_pointer_frame_offset ()
+{
+	TempoMap& map (_editor->session()->tempo_map());
+	const double beat_at_frame = map.beat_at_frame (raw_grab_frame());
+	const uint32_t divisions = _editor->get_grid_beat_divisions (0);
+	double beat = 0.0;
+
+	if (divisions > 0) {
+		beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * divisions)) / divisions);
+	} else {
+		/* while it makes some sense for the user to determine the division to 'grab',
+		   grabbing a bar often leads to confusing results wrt the actual tempo section being altered
+		   and the result over steep tempo curves. Use sixteenths.
+		*/
+		beat = floor (beat_at_frame) + (floor (((beat_at_frame - floor (beat_at_frame)) * 4)) / 4);
+	}
+
+	_pulse = map.pulse_at_beat (beat);
+
+	_pointer_frame_offset = raw_grab_frame() - map.frame_at_pulse (_pulse);
+
+}
+
+void
+BBTRulerDrag::motion (GdkEvent* event, bool first_move)
+{
+	TempoMap& map (_editor->session()->tempo_map());
+
+	if (first_move) {
+		/* get current state */
+		before_state = &map.get_state();
+		_editor->begin_reversible_command (_("dilate tempo"));
+	}
+
+	framepos_t pf;
+
+	if (_editor->snap_musical()) {
+		pf = adjusted_current_frame (event, false);
+	} else {
+		pf = adjusted_current_frame (event);
+	}
+
+	if (Keyboard::modifier_state_contains (event->button.state, ArdourKeyboard::constraint_modifier())) {
+		/* adjust previous tempo to match pointer frame */
+		_editor->session()->tempo_map().gui_dilate_tempo (_tempo, map.frame_at_pulse (_pulse), pf, _pulse);
+	}
+	ostringstream sstr;
+	sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).beats_per_minute() << "\n";
+	sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute();
+	show_verbose_cursor_text (sstr.str());
+}
+
+void
+BBTRulerDrag::finished (GdkEvent* event, bool movement_occurred)
+{
+	if (!movement_occurred) {
+		return;
+	}
+
+	TempoMap& map (_editor->session()->tempo_map());
+
+	XMLNode &after = map.get_state();
+	_editor->session()->add_command(new MementoCommand<TempoMap>(map, before_state, &after));
+	_editor->commit_reversible_command ();
+}
+
+void
+BBTRulerDrag::aborted (bool moved)
+{
+	if (moved) {
+		_editor->session()->tempo_map().set_state (*before_state, Stateful::current_state_version);
+	}
+}
+
+
 CursorDrag::CursorDrag (Editor* e, EditorCursor& c, bool s)
 	: Drag (e, &c.track_canvas_item(), false)
 	, _cursor (c)
@@ -4184,6 +4244,10 @@ MarkerDrag::finished (GdkEvent* event, bool movement_occurred)
 			} else {
 				location->set (((*x).location)->start(), ((*x).location)->end());
 			}
+
+			if (location->is_session_range()) {
+				_editor->session()->set_end_is_free (false);
+			}
 		}
 	}
 
@@ -4715,7 +4779,7 @@ RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred)
 			/* MIDI track */
 			if (_editor->selection->empty() && _editor->mouse_mode == MouseDraw) {
 				/* nothing selected */
-				add_midi_region (mtv, true);
+				add_midi_region (mtv, true, _editor->get_grid_music_divisions(event->button.state));
 				do_deselect = false;
 			}
 		}
@@ -5042,7 +5106,7 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
 			TrackViewList grouped_add = new_selection;
 			for (TrackViewList::const_iterator i = new_selection.begin(); i != new_selection.end(); ++i) {
 				RouteTimeAxisView *n = dynamic_cast<RouteTimeAxisView *>(*i);
-				if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::select.property_id) ) {
+				if ( n && n->route()->route_group() && n->route()->route_group()->is_active() && n->route()->route_group()->enabled_property (ARDOUR::Properties::group_select.property_id) ) {
 					for (TrackViewList::const_iterator j = all_tracks.begin(); j != all_tracks.end(); ++j) {
 						RouteTimeAxisView *check = dynamic_cast<RouteTimeAxisView *>(*j);
 						if ( check && (n != check) && (check->route()->route_group() == n->route()->route_group()) )
@@ -5950,6 +6014,9 @@ void
 PatchChangeDrag::finished (GdkEvent* ev, bool movement_occurred)
 {
 	if (!movement_occurred) {
+		if (was_double_click()) {
+			_region_view->edit_patch_change (_patch_change);
+		}
 		return;
 	}
 
@@ -6284,7 +6351,7 @@ RegionCutDrag::motion (GdkEvent*, bool)
 }
 
 void
-RegionCutDrag::finished (GdkEvent*, bool)
+RegionCutDrag::finished (GdkEvent* event, bool)
 {
 	_editor->get_track_canvas()->canvas()->re_enter();
 
@@ -6298,7 +6365,7 @@ RegionCutDrag::finished (GdkEvent*, bool)
 		return;
 	}
 
-	_editor->split_regions_at (pos, rs);
+	_editor->split_regions_at (pos, rs, _editor->get_grid_music_divisions (event->button.state));
 }
 
 void