enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / verbose_cursor.cc

diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index 4973cee0b303aa5b98c5a562131ab1be985279c6..bf11733b6d25e93e7e69b45dfa2870d2edeb89aa 100644 (file)
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -26,15 +26,15 @@
 #include "canvas/scroll_group.h"
 #include "canvas/tracking_text.h"
 
-#include "ardour_ui.h"
 #include "audio_clock.h"
 #include "editor.h"
 #include "editor_drag.h"
-#include "global_signals.h"
 #include "main_clock.h"
 #include "verbose_cursor.h"
+#include "ardour_ui.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -44,16 +44,16 @@ VerboseCursor::VerboseCursor (Editor* editor)
 {
        _canvas_item = new ArdourCanvas::TrackingText (_editor->get_noscroll_group());
        CANVAS_DEBUG_NAME (_canvas_item, "verbose canvas cursor");
-       _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_LargerBoldFont()));
+       _canvas_item->set_font_description (Pango::FontDescription (UIConfiguration::instance().get_LargerBoldFont()));
        color_handler ();
 
-       ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));
+       UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler));
 }
 
 void
 VerboseCursor::color_handler ()
 {
-       _canvas_item->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
+       _canvas_item->set_color (UIConfiguration::instance().color_mod ("verbose canvas cursor", "verbose canvas cursor"));
 }
 
 ArdourCanvas::Item *
@@ -137,7 +137,7 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end)
        Timecode::Time timecode;
        Timecode::BBT_Time sbbt;
        Timecode::BBT_Time ebbt;
-       Meter meter_at_start (_editor->_session->tempo_map().meter_at(start));
+       Meter meter_at_start (_editor->_session->tempo_map().meter_at_frame (start));
 
        if (_editor->_session == 0) {
                return;