diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/main_clock.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/step_editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/tempo_dialog.cc | 2 |
5 files changed, 11 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ac1a0370b0..184c3a06c7 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -97,6 +97,7 @@ typedef uint64_t microseconds_t; #include "about.h" +#include "editing.h" #include "actions.h" #include "add_route_dialog.h" #include "ambiguous_file_dialog.h" @@ -152,6 +153,7 @@ using namespace PBD; using namespace Gtkmm2ext; using namespace Gtk; using namespace std; +using namespace Editing; ARDOUR_UI *ARDOUR_UI::theArdourUI = 0; @@ -2354,7 +2356,7 @@ ARDOUR_UI::update_clocks () if (!_session) return; if (editor && !editor->dragging_playhead()) { - Clock (_session->audible_frame(), false, editor->get_preferred_edit_position (true)); /* EMIT_SIGNAL */ + Clock (_session->audible_frame(), false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD)); /* EMIT_SIGNAL */ } } @@ -4405,13 +4407,13 @@ void ARDOUR_UI::update_transport_clocks (framepos_t pos) { if (ui_config->get_primary_clock_delta_edit_cursor()) { - primary_clock->set (pos, false, editor->get_preferred_edit_position (true)); + primary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD)); } else { primary_clock->set (pos); } if (ui_config->get_secondary_clock_delta_edit_cursor()) { - secondary_clock->set (pos, false, editor->get_preferred_edit_position (true)); + secondary_clock->set (pos, false, editor->get_preferred_edit_position (EDIT_IGNORE_PHEAD)); } else { secondary_clock->set (pos); } diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index ca48cd6dd1..0ea6e6f9ca 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1751,10 +1751,10 @@ Editor::select_all_selectables_using_edit (bool after) list<Selectable *> touched; if (after) { - start = get_preferred_edit_position(false, true); + start = get_preferred_edit_position(EDIT_IGNORE_NONE, true); end = _session->current_end_frame(); } else { - if ((end = get_preferred_edit_position(false, true)) > 1) { + if ((end = get_preferred_edit_position(EDIT_IGNORE_NONE, true)) > 1) { start = 0; end -= 1; } else { diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index 26d780ea8a..f0cbd9bf28 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -73,7 +73,7 @@ MainClock::absolute_time () const { if (get_is_duration ()) { // delta to edit cursor - return current_time () + PublicEditor::instance().get_preferred_edit_position (true); + return current_time () + PublicEditor::instance().get_preferred_edit_position (Editing::EDIT_IGNORE_PHEAD); } else { return current_time (); } diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index 7bd82cfa7d..63d706672d 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -88,7 +88,7 @@ StepEditor::start_step_editing () void StepEditor::resync_step_edit_position () { - step_edit_insert_position = _editor.get_preferred_edit_position (false, false, true); + step_edit_insert_position = _editor.get_preferred_edit_position (Editing::EDIT_IGNORE_NONE, false, true); } void diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index d430f22523..a458c4220a 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -300,6 +300,8 @@ TempoDialog::tap_tempo_button_press (GdkEventButton *ev) tapped = true; } last_tap = now; + + return true; } bool |