diff --git a/gtk2_ardour/ardour_knob.cc b/gtk2_ardour/ardour_knob.cc index 5543950ac1..c244411562 100644 --- a/gtk2_ardour/ardour_knob.cc +++ b/gtk2_ardour/ardour_knob.cc @@ -38,6 +38,7 @@ #include "ardour_ui.h" #include "global_signals.h" +#include "canvas/colors.h" #include "canvas/utils.h" #include "i18n.h" diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index acf117950e..0a2222dedd 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -46,6 +46,7 @@ #include "canvas/xfade_curve.h" #include "canvas/debug.h" #include "canvas/utils.h" +#include "canvas/colors.h" #include "streamview.h" #include "audio_region_view.h" diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc index dfbcc4c6ac..3521eb1ac1 100644 --- a/gtk2_ardour/editor_group_tabs.cc +++ b/gtk2_ardour/editor_group_tabs.cc @@ -21,7 +21,7 @@ #include "ardour/route_group.h" -#include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour_ui.h" #include "editor.h" diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc index 0b316ec771..4789435078 100644 --- a/gtk2_ardour/mixer_group_tabs.cc +++ b/gtk2_ardour/mixer_group_tabs.cc @@ -23,7 +23,7 @@ #include "ardour/route_group.h" -#include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour_ui.h" #include "mixer_group_tabs.h" diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index c56149797f..d4604b265d 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -34,6 +34,7 @@ #include "canvas/text.h" #include "canvas/line.h" #include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour_ui.h" #include "global_signals.h" diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index ab8a5ae143..af8699c001 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -36,6 +36,7 @@ #include "canvas/rectangle.h" #include "canvas/debug.h" #include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour/profile.h" diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 440d1e9310..c698263d57 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -32,7 +32,7 @@ #include "canvas/rectangle.h" #include "canvas/debug.h" #include "canvas/text.h" -#include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour/profile.h" diff --git a/libs/canvas/canvas/utils.h b/libs/canvas/canvas/utils.h index 9522899913..97bbfb8fb8 100644 --- a/libs/canvas/canvas/utils.h +++ b/libs/canvas/canvas/utils.h @@ -24,12 +24,6 @@ namespace ArdourCanvas { - extern LIBCANVAS_API void color_to_hsv (Color color, double& h, double& s, double& v); - extern LIBCANVAS_API Color hsv_to_color (double h, double s, double v, double a); - - extern LIBCANVAS_API void color_to_rgba (Color, double& r, double& g, double& b, double& a); - extern LIBCANVAS_API Color rgba_to_color (double r, double g, double b, double a); - extern LIBCANVAS_API void set_source_rgba (Cairo::RefPtr, Color); extern LIBCANVAS_API void set_source_rgb_a (Cairo::RefPtr, Color, float alpha); //override the color's alpha @@ -37,7 +31,5 @@ namespace ArdourCanvas { extern LIBCANVAS_API void set_source_rgb_a (cairo_t*, Color, float alpha); //override the color's alpha Distance LIBCANVAS_API distance_to_segment_squared (Duple const & p, Duple const & p1, Duple const & p2, double& t, Duple& at); - - uint32_t LIBCANVAS_API contrasting_text_color (uint32_t c); } diff --git a/libs/canvas/fill.cc b/libs/canvas/fill.cc index 9c93523e51..bf72c678aa 100644 --- a/libs/canvas/fill.cc +++ b/libs/canvas/fill.cc @@ -28,6 +28,7 @@ #include "canvas/item.h" #include "canvas/types.h" #include "canvas/utils.h" +#include "canvas/colors.h" using namespace std; using namespace ArdourCanvas; diff --git a/libs/canvas/text.cc b/libs/canvas/text.cc index be5eb4b1f9..8744a7fd77 100644 --- a/libs/canvas/text.cc +++ b/libs/canvas/text.cc @@ -27,6 +27,7 @@ #include "canvas/text.h" #include "canvas/canvas.h" #include "canvas/utils.h" +#include "canvas/colors.h" using namespace std; using namespace ArdourCanvas; diff --git a/libs/canvas/utils.cc b/libs/canvas/utils.cc index be509cdbe8..1eb11f422d 100644 --- a/libs/canvas/utils.cc +++ b/libs/canvas/utils.cc @@ -21,127 +21,11 @@ #include #include #include + #include "canvas/utils.h" -using std::max; -using std::min; - -void -ArdourCanvas::color_to_hsv (Color color, double& h, double& s, double& v) -{ - double r, g, b, a; - double cmax; - double cmin; - double delta; - - color_to_rgba (color, r, g, b, a); - - if (r > g) { - cmax = max (r, b); - } else { - cmax = max (g, b); - } - - if (r < g) { - cmin = min (r, b); - } else { - cmin = min (g, b); - } - - v = cmax; - - delta = cmax - cmin; - - if (cmax == 0) { - // r = g = b == 0 ... v is undefined, s = 0 - s = 0.0; - h = -1.0; - } - - if (delta != 0.0) { - if (cmax == r) { - h = fmod ((g - b)/delta, 6.0); - } else if (cmax == g) { - h = ((b - r)/delta) + 2; - } else { - h = ((r - g)/delta) + 4; - } - - h *= 60.0; - } - - if (delta == 0 || cmax == 0) { - s = 0; - } else { - s = delta / cmax; - } - -} - -ArdourCanvas::Color -ArdourCanvas::hsv_to_color (double h, double s, double v, double a) -{ - s = min (1.0, max (0.0, s)); - v = min (1.0, max (0.0, v)); - - if (s == 0) { - // achromatic (grey) - return rgba_to_color (v, v, v, a); - } - - h = min (360.0, max (0.0, h)); - - double c = v * s; - double x = c * (1.0 - fabs(fmod(h / 60.0, 2) - 1.0)); - double m = v - c; - - if (h >= 0.0 && h < 60.0) { - return rgba_to_color (c + m, x + m, m, a); - } else if (h >= 60.0 && h < 120.0) { - return rgba_to_color (x + m, c + m, m, a); - } else if (h >= 120.0 && h < 180.0) { - return rgba_to_color (m, c + m, x + m, a); - } else if (h >= 180.0 && h < 240.0) { - return rgba_to_color (m, x + m, c + m, a); - } else if (h >= 240.0 && h < 300.0) { - return rgba_to_color (x + m, m, c + m, a); - } else if (h >= 300.0 && h < 360.0) { - return rgba_to_color (c + m, m, x + m, a); - } - return rgba_to_color (m, m, m, a); -} - -void -ArdourCanvas::color_to_rgba (Color color, double& r, double& g, double& b, double& a) -{ - r = ((color >> 24) & 0xff) / 255.0; - g = ((color >> 16) & 0xff) / 255.0; - b = ((color >> 8) & 0xff) / 255.0; - a = ((color >> 0) & 0xff) / 255.0; -} - -ArdourCanvas::Color -ArdourCanvas::rgba_to_color (double r, double g, double b, double a) -{ - /* clamp to [0 .. 1] range */ - - r = min (1.0, max (0.0, r)); - g = min (1.0, max (0.0, g)); - b = min (1.0, max (0.0, b)); - a = min (1.0, max (0.0, a)); - - /* convert to [0..255] range */ - - unsigned int rc, gc, bc, ac; - rc = rint (r * 255.0); - gc = rint (g * 255.0); - bc = rint (b * 255.0); - ac = rint (a * 255.0); - - /* build-an-integer */ - - return (rc << 24) | (gc << 16) | (bc << 8) | ac; -} +using namespace std; +using namespace ArdourCanvas; void ArdourCanvas::set_source_rgba (Cairo::RefPtr context, Color color) @@ -253,49 +137,3 @@ ArdourCanvas::distance_to_segment_squared (Duple const & p, Duple const & p1, Du return ((dpqx * dpqx) + (dpqy * dpqy)); } -// Inverse of sRGB "gamma" function. -static inline double -inv_gam_sRGB (double c) -{ - if (c <= 0.04045) { - return c/12.92; - } else { - return pow(((c+0.055)/(1.055)),2.4); - } -} - -// sRGB "gamma" function -static inline int -gam_sRGB(double v) -{ - if (v <= 0.0031308) { - v *= 12.92; - } else { - v = 1.055 * pow (v, 1.0 / 2.4) - 0.055; - } - return int (v*255+.5); -} - -static double -luminance (uint32_t c) -{ - // sRGB luminance(Y) values - const double rY = 0.212655; - const double gY = 0.715158; - const double bY = 0.072187; - - double r, g, b, a; - - ArdourCanvas::color_to_rgba (c, r, g, b, a); - - return (gam_sRGB (rY*inv_gam_sRGB(r) + gY*inv_gam_sRGB(g) + bY*inv_gam_sRGB(b))) / 255.0; -} - -uint32_t -ArdourCanvas::contrasting_text_color (uint32_t c) -{ - static const uint32_t white = ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0); - static const uint32_t black = ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0); - - return (luminance (c) < 0.50) ? white : black; -} diff --git a/libs/canvas/wave_view.cc b/libs/canvas/wave_view.cc index aa857a8467..a8e4a3f286 100644 --- a/libs/canvas/wave_view.cc +++ b/libs/canvas/wave_view.cc @@ -34,6 +34,7 @@ #include "canvas/wave_view.h" #include "canvas/utils.h" #include "canvas/canvas.h" +#include "canvas/colors.h" #include diff --git a/libs/canvas/wscript b/libs/canvas/wscript index cb7dc83e27..684871e54f 100644 --- a/libs/canvas/wscript +++ b/libs/canvas/wscript @@ -32,6 +32,7 @@ canvas_sources = [ 'arrow.cc', 'canvas.cc', 'circle.cc', + 'colors.cc', 'container.cc', 'curve.cc', 'debug.cc',