diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 97ea37879b..5bfc7ca920 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -1128,13 +1128,13 @@ Editor::set_xjadeo_viewoption (int what) void Editor::edit_current_meter () { - edit_meter_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).get_editable_meter()); + edit_meter_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->last_when()).get_editable_meter()); } void Editor::edit_current_tempo () { - edit_tempo_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).get_editable_tempo()); + edit_tempo_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->last_when()).get_editable_tempo()); } RefPtr diff --git a/gtk2_ardour/main_clock.cc b/gtk2_ardour/main_clock.cc index ebc8ea38f0..d0241f4d60 100644 --- a/gtk2_ardour/main_clock.cc +++ b/gtk2_ardour/main_clock.cc @@ -97,16 +97,6 @@ MainClock::build_ops_menu () ops_items.push_back (MenuElem (_("Insert Time Signature Change"), sigc::mem_fun(*this, &MainClock::insert_new_meter))); } -timepos_t -MainClock::absolute_time () const -{ - if (get_is_duration ()) { - return last_when (); - } else { - return last_when (); - } -} - void MainClock::set (timepos_t const & when, bool force) { @@ -154,24 +144,24 @@ void MainClock::edit_current_tempo () { if (!PublicEditor::instance().session()) return; - PublicEditor::instance().edit_tempo_section (Temporal::TempoMap::use()->metric_at (absolute_time()).get_editable_tempo()); + PublicEditor::instance().edit_tempo_section (Temporal::TempoMap::use()->metric_at (last_when()).get_editable_tempo()); } void MainClock::edit_current_meter () { if (!PublicEditor::instance().session()) return; - PublicEditor::instance().edit_meter_section (Temporal::TempoMap::use()->metric_at (absolute_time()).get_editable_meter()); + PublicEditor::instance().edit_meter_section (Temporal::TempoMap::use()->metric_at (last_when()).get_editable_meter()); } void MainClock::insert_new_tempo () { - PublicEditor::instance().mouse_add_new_tempo_event (absolute_time ()); + PublicEditor::instance().mouse_add_new_tempo_event (last_when ()); } void MainClock::insert_new_meter () { - PublicEditor::instance().mouse_add_new_meter_event (absolute_time ()); + PublicEditor::instance().mouse_add_new_meter_event (last_when ()); } diff --git a/gtk2_ardour/main_clock.h b/gtk2_ardour/main_clock.h index a87ca600c5..b23ee4c60a 100644 --- a/gtk2_ardour/main_clock.h +++ b/gtk2_ardour/main_clock.h @@ -29,14 +29,10 @@ class MainClock : public AudioClock { public: MainClock (const std::string& clock_name, const std::string& widget_name, bool primary); - Temporal::timepos_t absolute_time () const; void set_session (ARDOUR::Session *s); void set (Temporal::timepos_t const &, bool force = false); private: - - // Editor *_editor; - void build_ops_menu (); void set_display_delta_mode (ARDOUR::ClockDeltaMode); void edit_current_tempo ();