diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:42:12 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-09 23:42:12 -0400 |
| commit | 3f38a602cc4a6170dda7c19f7dd14f11717d5c9b (patch) | |
| tree | bd237bb20a2fb02445d5e123eb34736edef9fb5f /gtk2_ardour/region_view.cc | |
| parent | 96fbdd4bee099f00c64bcca322e6eae313f5679e (diff) | |
remove instances of RGBA_TO_UINT() macro from region_view.cc
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index 378488ab51..86eb373797 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -33,6 +33,7 @@ #include "canvas/pixbuf.h" #include "canvas/text.h" #include "canvas/line.h" +#include "canvas/utils.h" #include "ardour_ui.h" #include "global_signals.h" @@ -525,8 +526,8 @@ RegionView::set_colors () if (sync_mark) { /* XXX: make these colours themable */ - sync_mark->set_fill_color (RGBA_TO_UINT (0, 255, 0, 255)); - sync_line->set_outline_color (RGBA_TO_UINT (0, 255, 0, 255)); + sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); + sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); } } @@ -626,11 +627,11 @@ RegionView::region_sync_changed () sync_mark = new ArdourCanvas::Polygon (group); CANVAS_DEBUG_NAME (sync_mark, string_compose ("sync mark for %1", get_item_name())); - sync_mark->set_fill_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour + sync_mark->set_fill_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // FIXME make a themeable colour sync_line = new ArdourCanvas::Line (group); CANVAS_DEBUG_NAME (sync_line, string_compose ("sync mark for %1", get_item_name())); - sync_line->set_outline_color (RGBA_TO_UINT(0,255,0,255)); // FIXME make a themeable colour + sync_line->set_outline_color (ArdourCanvas::rgba_to_color (0, 1.0, 0, 1.0)); // FIXME make a themeable colour } /* this has to handle both a genuine change of position, a change of samples_per_pixel |