#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 "main_clock.h"
+#include "utils.h"
+#include "verbose_cursor.h"
#include "i18n.h"
, _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 *
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) {
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) {
beats -= sbbt.beats;
if (beats < 0) {
- beats += int (meter_at_start.beats_per_bar());
+ beats += int (meter_at_start.divisions_per_bar());
--bars;
}