diff options
| author | Robin Gareus <robin@gareus.org> | 2017-07-17 18:34:35 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-07-17 21:06:04 +0200 |
| commit | 601c317d70a03190257577bd867cefc2c70d3275 (patch) | |
| tree | 077071290f084431a912414c4e87b6127c586677 /libs/surfaces/push2/knob.cc | |
| parent | 1f5ebc54853446a786925941bd014666e75221d2 (diff) | |
Clean up library inheritance (colors.h, utils.h)
make libwidget independent of libcanvas.
Confine basics to pbd and gtkmm2ext.
Diffstat (limited to 'libs/surfaces/push2/knob.cc')
| -rw-r--r-- | libs/surfaces/push2/knob.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/push2/knob.cc b/libs/surfaces/push2/knob.cc index fe745405b5..8bd5005c10 100644 --- a/libs/surfaces/push2/knob.cc +++ b/libs/surfaces/push2/knob.cc @@ -28,7 +28,7 @@ #include "gtkmm2ext/gui_thread.h" #include "gtkmm2ext/rgb_macros.h" -#include "canvas/colors.h" +#include "gtkmm2ext/colors.h" #include "canvas/text.h" #include "knob.h" @@ -75,7 +75,7 @@ Push2Knob::~Push2Knob () } void -Push2Knob::set_text_color (Color c) +Push2Knob::set_text_color (Gtkmm2ext::Color c) { text->set_color (c); } @@ -145,8 +145,8 @@ Push2Knob::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) con double red_start, green_start, blue_start, astart; double red_end, green_end, blue_end, aend; - ArdourCanvas::color_to_rgba (arc_start_color, red_start, green_start, blue_start, astart); - ArdourCanvas::color_to_rgba (arc_end_color, red_end, green_end, blue_end, aend); + Gtkmm2ext::color_to_rgba (arc_start_color, red_start, green_start, blue_start, astart); + Gtkmm2ext::color_to_rgba (arc_end_color, red_end, green_end, blue_end, aend); //vary the arc color over the travel of the knob float intensity = fabsf (_val - zero) / std::max(zero, (1.f - zero)); |