diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-02 17:50:37 +0000 |
| commit | 83f385d26336f58c1b2e3ce49c609fe86878b56d (patch) | |
| tree | 5cc50c4afd705ad83ee4455bd4547eaffc7e7895 /gtk2_ardour/ardour_ui_options.cc | |
| parent | add91aa2d723c15148d83dae7c8178ee6102146e (diff) | |
audio clock switchover part2: remove most egregious include-time dependency on audio_clock.h, and alter API for a few utilities along the way
git-svn-id: svn://localhost/ardour2/branches/3.0@9673 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_options.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_options.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index 5bcecfaef5..bde57f4385 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -35,6 +35,7 @@ #include "ardour/osc.h" #endif +#include "audio_clock.h" #include "ardour_ui.h" #include "actions.h" #include "gui_thread.h" @@ -395,9 +396,9 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "show-track-meters") { editor->toggle_meter_updating(); } else if (p == "primary-clock-delta-edit-cursor") { - primary_clock.set_is_duration (Config->get_primary_clock_delta_edit_cursor()); + primary_clock->set_is_duration (Config->get_primary_clock_delta_edit_cursor()); } else if (p == "secondary-clock-delta-edit-cursor") { - secondary_clock.set_is_duration (Config->get_secondary_clock_delta_edit_cursor()); + secondary_clock->set_is_duration (Config->get_secondary_clock_delta_edit_cursor()); } } @@ -407,11 +408,11 @@ ARDOUR_UI::reset_main_clocks () ENSURE_GUI_THREAD (*this, &ARDOUR_UI::reset_main_clocks) if (_session) { - primary_clock.set (_session->audible_frame(), true); - secondary_clock.set (_session->audible_frame(), true); + primary_clock->set (_session->audible_frame(), true); + secondary_clock->set (_session->audible_frame(), true); } else { - primary_clock.set (0, true); - secondary_clock.set (0, true); + primary_clock->set (0, true); + secondary_clock->set (0, true); } } |