mp4chaps Lua script: don't clutter global environment

[ardour.git] / gtk2_ardour / mini_timeline.cc

diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc
index 3c99a12f1e10a56d007bf6693c7cc316f64d334d..443da0a6f6fd77c2a4ff8d3631c9cebe8da681dd 100644 (file)
--- a/gtk2_ardour/mini_timeline.cc
+++ b/gtk2_ardour/mini_timeline.cc
@@ -20,18 +20,17 @@
 #include "ardour/session.h"
 #include "ardour/tempo.h"
 
+#include "gtkmm2ext/colors.h"
 #include "gtkmm2ext/gui_thread.h"
 #include "gtkmm2ext/keyboard.h"
 
-#include "canvas/colors.h"
-#include "canvas/utils.h"
+#include "widgets/tooltips.h"
 
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "main_clock.h"
 #include "mini_timeline.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "ui_config.h"
 
 #include "pbd/i18n.h"
@@ -70,7 +69,7 @@ MiniTimeline::MiniTimeline ()
        Location::start_changed.connect (marker_connection, invalidator (*this), boost::bind (&MiniTimeline::update_minitimeline, this), gui_context ());
        Location::flags_changed.connect (marker_connection, invalidator (*this), boost::bind (&MiniTimeline::update_minitimeline, this), gui_context ());
 
-       ARDOUR_UI_UTILS::set_tooltip (*this,
+       ArdourWidgets::set_tooltip (*this,
                        string_compose (_("<b>Navigation Timeline</b>. Use left-click to locate to time position or marker; scroll-wheel to jump, hold %1 for fine grained and %2 + %3 for extra-fine grained control. Right-click to set display range. The display unit is defined by the primary clock."),
                                Gtkmm2ext::Keyboard::primary_modifier_name(),
                                Gtkmm2ext::Keyboard::primary_modifier_name (),
@@ -305,14 +304,14 @@ MiniTimeline::format_time (framepos_t when)
 }
 
 void
-MiniTimeline::draw_dots (cairo_t* cr, int left, int right, int y, ArdourCanvas::Color color)
+MiniTimeline::draw_dots (cairo_t* cr, int left, int right, int y, Gtkmm2ext::Color color)
 {
        if (left + 1 >= right) {
                return;
        }
        cairo_move_to (cr, left + .5, y + .5);
        cairo_line_to (cr, right - .5, y + .5);
-       ArdourCanvas::set_source_rgb_a(cr, color, 0.3);
+       Gtkmm2ext::set_source_rgb_a(cr, color, 0.3);
        const double dashes[] = { 0, 1 };
        cairo_set_dash (cr, dashes, 2, 1);
        cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
@@ -357,7 +356,7 @@ MiniTimeline::draw_mark (cairo_t* cr, int x0, int x1, const std::string& label,
                        prelight ? "entered marker" : "location marker");
 
        double r, g, b, a;
-       ArdourCanvas::color_to_rgba (color, r, g, b, a);
+       Gtkmm2ext::color_to_rgba (color, r, g, b, a);
 
        if (rw < x0) {
                rw = x1;
@@ -444,7 +443,7 @@ MiniTimeline::draw_edge (cairo_t* cr, int x0, int x1, bool left, const std::stri
                        prelight ? "entered marker" : "location marker");
 
        double r, g, b, a;
-       ArdourCanvas::color_to_rgba (color, r, g, b, a);
+       Gtkmm2ext::color_to_rgba (color, r, g, b, a);
 
        if (with_label) {
                const int y = PADDING;
@@ -493,8 +492,8 @@ MiniTimeline::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_
 {
        cairo_t* cr = ctx->cobj();
        // TODO cache, set_colors()
-       ArdourCanvas::Color base = UIConfiguration::instance().color ("ruler base");
-       ArdourCanvas::Color text = UIConfiguration::instance().color ("ruler text");
+       Gtkmm2ext::Color base = UIConfiguration::instance().color ("ruler base");
+       Gtkmm2ext::Color text = UIConfiguration::instance().color ("ruler text");
 
        if (_n_labels == 0) {
                return;
@@ -504,7 +503,7 @@ MiniTimeline::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_
        const int height = get_height ();
 
        Gtkmm2ext::rounded_rectangle (cr, 0, 0, width, height, 4);
-       ArdourCanvas::set_source_rgba(cr, base);
+       Gtkmm2ext::set_source_rgba(cr, base);
        cairo_fill (cr);
 
        Gtkmm2ext::rounded_rectangle (cr, PADDING, PADDING, width - PADDING - PADDING, height - PADDING - PADDING, 4);
@@ -536,7 +535,7 @@ MiniTimeline::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_
                draw_dots (cr, dot_left, x0, y0 + _time_height * .5, text);
 
                cairo_move_to (cr, x0, y0);
-               ArdourCanvas::set_source_rgba(cr, text);
+               Gtkmm2ext::set_source_rgba(cr, text);
                pango_cairo_show_layout (cr, _layout->gobj());
                dot_left = x0 + lw;
        }