summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2014-06-27 09:35:19 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2014-06-27 09:37:57 -0400
commit0a9595f74f90d37f6a31008bd796e356ddfce9ca (patch)
tree1939b1b20d9bd7de5e9fcc89149222f50b24a0ae
parent353f857d6e6afb2782009fd556fe3d6b80da3d2a (diff)
make verbose canvas cursor color be set in its constructor rather than explicitly
-rw-r--r--gtk2_ardour/editor_canvas.cc1
-rw-r--r--gtk2_ardour/verbose_cursor.cc7
-rw-r--r--gtk2_ardour/verbose_cursor.h2
3 files changed, 1 insertions, 9 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 79404c53c7..d0107c789e 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -868,7 +868,6 @@ Editor::color_handler()
bbt_ruler->set_outline_color (text);
playhead_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_PlayHead());
- _verbose_cursor->set_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
meter_bar->set_fill_color (ARDOUR_UI::config()->get_canvasvar_MeterBar());
meter_bar->set_outline_color (ARDOUR_UI::config()->get_canvasvar_MarkerBarSeparator());
diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc
index 3ce093511b..bad901d219 100644
--- a/gtk2_ardour/verbose_cursor.cc
+++ b/gtk2_ardour/verbose_cursor.cc
@@ -44,6 +44,7 @@ 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_color (ARDOUR_UI::config()->get_canvasvar_VerboseCanvasCursor());
}
ArdourCanvas::Item *
@@ -220,12 +221,6 @@ VerboseCursor::set_duration (framepos_t start, framepos_t end)
_canvas_item->set (buf);
}
-void
-VerboseCursor::set_color (uint32_t color)
-{
- _canvas_item->set_color (color);
-}
-
bool
VerboseCursor::visible () const
{
diff --git a/gtk2_ardour/verbose_cursor.h b/gtk2_ardour/verbose_cursor.h
index 95cd65e7b8..66da15a329 100644
--- a/gtk2_ardour/verbose_cursor.h
+++ b/gtk2_ardour/verbose_cursor.h
@@ -34,8 +34,6 @@ public:
ArdourCanvas::Item* canvas_item () const;
bool visible () const;
- void set_color (uint32_t);
-
void set (std::string const &);
void set_time (framepos_t);
void set_duration (framepos_t, framepos_t);