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/verbose_cursor.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/verbose_cursor.cc')
| -rw-r--r-- | gtk2_ardour/verbose_cursor.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc index b51898929d..2ae215acec 100644 --- a/gtk2_ardour/verbose_cursor.cc +++ b/gtk2_ardour/verbose_cursor.cc @@ -21,11 +21,13 @@ #include <gtkmm/enums.h> #include "pbd/stacktrace.h" #include "ardour/profile.h" -#include "editor.h" + #include "ardour_ui.h" -#include "verbose_cursor.h" -#include "utils.h" +#include "audio_clock.h" +#include "editor.h" #include "editor_drag.h" +#include "utils.h" +#include "verbose_cursor.h" #include "i18n.h" @@ -38,13 +40,9 @@ VerboseCursor::VerboseCursor (Editor* editor) , _xoffset (0) , _yoffset (0) { - Pango::FontDescription* font = get_font_for_style (N_("VerboseCanvasCursor")); - _canvas_item = new ArdourCanvas::NoEventText (*_editor->track_canvas->root()); - _canvas_item->property_font_desc() = *font; + _canvas_item->property_font_desc() = get_font_for_style (N_("VerboseCanvasCursor")); _canvas_item->property_anchor() = Gtk::ANCHOR_NW; - - delete font; } ArdourCanvas::Item * @@ -131,9 +129,9 @@ VerboseCursor::set_time (framepos_t frame, double x, double y) AudioClock::Mode m; if (Profile->get_sae() || Profile->get_small_screen()) { - m = ARDOUR_UI::instance()->primary_clock.mode(); + m = ARDOUR_UI::instance()->primary_clock->mode(); } else { - m = ARDOUR_UI::instance()->secondary_clock.mode(); + m = ARDOUR_UI::instance()->secondary_clock->mode(); } switch (m) { @@ -185,9 +183,9 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end, double x, double AudioClock::Mode m; if (Profile->get_sae() || Profile->get_small_screen()) { - m = ARDOUR_UI::instance()->primary_clock.mode (); + m = ARDOUR_UI::instance()->primary_clock->mode (); } else { - m = ARDOUR_UI::instance()->secondary_clock.mode (); + m = ARDOUR_UI::instance()->secondary_clock->mode (); } switch (m) { |