diff options
| author | ben <ben@harrisonconsoles.com> | 2013-10-20 16:02:56 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-04-21 10:22:28 -0500 |
| commit | e2afdb21c348e89c39cd2d5f46e06d7f2726a43c (patch) | |
| tree | 8de85e21e209d083ba9c08479281c5c66b02f153 /gtk2_ardour/editor_ops.cc | |
| parent | 84f0dceefb2e4079e1f015a17e538f0cd795ba2e (diff) | |
minor tweaks to Cut Time dialog. Use an enum to tell preferred_edit_location what to ignore, so cut and insert dialogs will never use mouse location.
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 185ab5f1a8..0cef0d90e5 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2435,7 +2435,7 @@ Editor::play_from_edit_point_and_return () framepos_t start_frame; framepos_t return_frame; - start_frame = get_preferred_edit_position (true); + start_frame = get_preferred_edit_position ( EDIT_IGNORE_PHEAD ); if (_session->transport_rolling()) { _session->request_locate (start_frame, false); @@ -4533,7 +4533,7 @@ Editor::paste (float times, bool from_context) { DEBUG_TRACE (DEBUG::CutNPaste, "paste to preferred edit pos\n"); - paste_internal (get_preferred_edit_position (false, from_context), times); + paste_internal (get_preferred_edit_position (EDIT_IGNORE_NONE, from_context), times); } void @@ -5204,7 +5204,7 @@ Editor::insert_patch_change (bool from_context) return; } - const framepos_t p = get_preferred_edit_position (false, from_context); + const framepos_t p = get_preferred_edit_position (EDIT_IGNORE_NONE, from_context); /* XXX: bit of a hack; use the MIDNAM from the first selected region; there may be more than one, but the PatchChangeDialog can only offer @@ -7025,15 +7025,15 @@ Editor::do_cut_time () return; } - framepos_t pos = get_preferred_edit_position (); + framepos_t pos = get_preferred_edit_position (EDIT_IGNORE_MOUSE); ArdourDialog d (*this, _("Cut Time")); VButtonBox button_box; VBox option_box; - CheckButton glue_button (_("Move Glued Regions")); - CheckButton marker_button (_("Move Markers")); - CheckButton tempo_button (_("Move Tempo & Meters")); - AudioClock clock ("insertTimeClock", true, X_("InsertTimeClock"), true, true, true); + CheckButton glue_button (_("Move Glued Regions")); glue_button.set_active(); + CheckButton marker_button (_("Move Markers")); marker_button.set_active(); + CheckButton tempo_button (_("Move Tempo & Meters")); tempo_button.set_active(); + AudioClock clock ("cutTimeClock", true, "", true, false, true, false); HBox clock_box; clock.set (0); |