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.h | |
| 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.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 423189c3ed..6d96827971 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -63,7 +63,6 @@ #include "ardour/utils.h" #include "ardour/session_handle.h" -#include "audio_clock.h" #include "ardour_dialog.h" #include "editing.h" #include "ui_config.h" @@ -193,10 +192,10 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void xrun_handler (framepos_t); void create_xrun_marker (framepos_t); - AudioClock primary_clock; - AudioClock secondary_clock; - AudioClock preroll_clock; - AudioClock postroll_clock; + AudioClock* primary_clock; + AudioClock* secondary_clock; + AudioClock* preroll_clock; + AudioClock* postroll_clock; void store_clock_modes (); void restore_clock_modes (); @@ -337,7 +336,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void manage_window (Gtk::Window&); - AudioClock big_clock; + AudioClock* big_clock; ActionWindowProxy<Gtk::Window>* big_clock_window; int original_big_clock_width; int original_big_clock_height; |