ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

MainClock: drop absolute_time as an alias for last_when

This commit is contained in:
Mads Kiilerich 2022-11-18 11:29:01 +01:00
parent 1314987f8b
commit 8f5b7aff3a
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/editor_actions.cc
View File

@ -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<RadioAction>

18
gtk2_ardour/main_clock.cc
View File

@ -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 ());
}

4
gtk2_ardour/main_clock.h
View File

@ -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 ();