remove more unused MIDI note colors

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index 5fc87cf8dd487a37087bac76e7404b747528158d..1d74dd66a4a606b0bf2f55e54c7f492b3c390671 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -2935,9 +2935,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
                                                                                            ArdourCanvas::Rect (note->x0(), note->y0(), note->x0(), note->y1()));
 
                        // calculate the colors: get the color settings
-                       uint32_t fill_color = UINT_RGBA_CHANGE_A(
-                               UIConfiguration::instance().color ("midi note selected"),
-                               128);
+                       uint32_t fill_color = NoteBase::meter_style_fill_color (note->note()->velocity(), true);
 
                        // make the resize preview notes more transparent and bright
                        fill_color = UINT_INTERPOLATE(fill_color, 0xFFFFFF40, 0.5);
@@ -2949,7 +2947,7 @@ MidiRegionView::begin_resizing (bool /*at_front*/)
                                0.85));
 
                        resize_rect->set_outline_color (NoteBase::calculate_outline (
-                                                               UIConfiguration::instance().color ("midi note selected")));
+                                                               UIConfiguration::instance().color ("midi note selected outline")));
 
                        resize_data->resize_rect = resize_rect;
                        _resize_data.push_back(resize_data);

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index b5d70c1a814e0aa761142078d5927e97a1c5d522..2e900c354eecfb5bfccc0b2926e070a270284f2b 100644 (file)
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -44,17 +44,13 @@ const uint32_t NoteBase::midi_channel_colors[16] = {
          0x832dd3ff,  0xa92dd3ff,  0xd32dbfff,  0xd32d67ff
        };
 
-bool     NoteBase::_color_init = false;
-uint32_t NoteBase::_selected_mod_col = 0;
-uint32_t NoteBase::_selected_outline_col = 0;
-uint32_t NoteBase::_selected_col = 0;
+bool             NoteBase::_color_init = false;
+Gtkmm2ext::Color NoteBase::_selected_col = 0;
 
 void
 NoteBase::set_colors ()
 {
-       _selected_mod_col = UIConfiguration::instance().color_mod ("midi note selected", "midi note");
-       _selected_outline_col = UIConfiguration::instance().color ("midi note selected outline");
-       _selected_col = UIConfiguration::instance().color ("midi note selected");
+       _selected_col = UIConfiguration::instance().color ("midi note selected outline");
 }
 
 NoteBase::NoteBase(MidiRegionView& region, bool with_events, const boost::shared_ptr<NoteType> note)
@@ -325,20 +321,18 @@ NoteBase::big_enough_to_trim () const
 }
 
 
-uint32_t
+Gtkmm2ext::Color
 NoteBase::meter_style_fill_color(uint8_t vel, bool /* selected */)
 {
        if (vel < 32) {
-               return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color0"), UIConfiguration::instance().color ("midi meter color1"), (vel / 32.0));
+               return UINT_INTERPOLATE(UIConfiguration::instance().color_mod ("midi meter color0", "midi note"), UIConfiguration::instance().color_mod ("midi meter color1", "midi note"), (vel / 32.0));
        } else if (vel < 64) {
-               return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color2"), UIConfiguration::instance().color ("midi meter color3"), ((vel-32) / 32.0));
+               return UINT_INTERPOLATE(UIConfiguration::instance().color_mod ("midi meter color2", "midi note"), UIConfiguration::instance().color_mod ("midi meter color3", "midi note"), ((vel-32) / 32.0));
        } else if (vel < 100) {
-               return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color4"), UIConfiguration::instance().color ("midi meter color5"), ((vel-64) / 36.0));
+               return UINT_INTERPOLATE(UIConfiguration::instance().color_mod ("midi meter color4", "midi note"), UIConfiguration::instance().color_mod ("midi meter color5", "midi note"), ((vel-64) / 36.0));
        } else if (vel < 112) {
-               return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color6"), UIConfiguration::instance().color ("midi meter color7"), ((vel-100) / 12.0));
+               return UINT_INTERPOLATE(UIConfiguration::instance().color_mod ("midi meter color6", "midi note"), UIConfiguration::instance().color_mod ("midi meter color7", "midi note"), ((vel-100) / 12.0));
        } else {
-               return  UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color8"), UIConfiguration::instance().color ("midi meter color9"), ((vel-112) / 17.0));
+               return  UINT_INTERPOLATE(UIConfiguration::instance().color_mod ("midi meter color8", "midi note"), UIConfiguration::instance().color_mod ("midi meter color9", "midi note"), ((vel-112) / 17.0));
        }
 }
-
-

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index f72f71181b7f71bcad27a91dc786fd80ca50af57..7062884e5b5df4eebf0a70ddcda04b12d1b6ba88 100644 (file)
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -24,6 +24,7 @@
 
 #include "temporal/beats.h"
 #include "canvas/types.h"
+#include "gtkmm2ext/colors.h"
 
 #include "rgb_macros.h"
 #include "ui_config.h"
@@ -103,12 +104,12 @@ public:
 
        static void set_colors ();
 
-       static uint32_t meter_style_fill_color(uint8_t vel, bool selected);
+       static Gtkmm2ext::Color meter_style_fill_color(uint8_t vel, bool selected);
 
        /// calculate outline colors from fill colors of notes
        inline static uint32_t calculate_outline(uint32_t color, bool selected=false) {
                if (selected) {
-                       return _selected_outline_col;
+                       return _selected_col;
                } else {
                        return UINT_INTERPOLATE(color, 0x000000ff, 0.5);
                }
@@ -140,9 +141,7 @@ protected:
 private:
        bool event_handler (GdkEvent *);
 
-       static uint32_t _selected_mod_col;
-       static uint32_t _selected_outline_col;
-       static uint32_t _selected_col;
+       static Gtkmm2ext::Color _selected_col;
        static bool _color_init;
 };
 

diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index 166a13fba6ccf1cf137ea6f756d0496f1e0a33ca..6fb317d03310f03e6a4a210f9a8d3d7b93713492 100644 (file)
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -277,7 +277,6 @@
     <ColorAlias name="midi meter color8" alias="color 56"/>
     <ColorAlias name="midi meter color9" alias="color 17"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
-    <ColorAlias name="midi note selected" alias="color 91"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>

diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 388f4a02058ffed07e11b225886e52122a0b72fb..6998bc98555835fe33897469e431e6711d3735fc 100644 (file)
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -277,7 +277,6 @@
     <ColorAlias name="midi meter color8" alias="color 56"/>
     <ColorAlias name="midi meter color9" alias="meter color3"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
-    <ColorAlias name="midi note selected" alias="color 80"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>

diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index f0f3b7ca091f81d59912f38859ee83403e28848f..49e61e3e92ac2a461fcd505ae790dd08ac70eaa5 100644 (file)
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -277,7 +277,6 @@
     <ColorAlias name="midi meter color8" alias="color 56"/>
     <ColorAlias name="midi meter color9" alias="meter color3"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
-    <ColorAlias name="midi note selected" alias="color 91"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 13"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>

diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 7a38d564f2b17abc6842535e013739072a664c32..e7b8a9b2b3fbf79024f596c19ed7bab31d3a790a 100644 (file)
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -277,7 +277,6 @@
     <ColorAlias name="midi meter color8" alias="color 56"/>
     <ColorAlias name="midi meter color9" alias="meter color3"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
-    <ColorAlias name="midi note selected" alias="color 29"/>
     <ColorAlias name="midi note selected outline" alias="color 67"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 9f969a9fec1f56f0ad56b98ef90c9d3cc90d64e2..d8fd0bee4420efbaa8794f549c7a42d4b1ad5e39 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -285,7 +285,6 @@
     <ColorAlias name="midi meter color8" alias="midi color4"/>
     <ColorAlias name="midi meter color9" alias="midi color5"/>
     <ColorAlias name="midi note inactive channel" alias="color 4"/>
-    <ColorAlias name="midi note selected" alias="color 40"/>
     <ColorAlias name="midi note selected outline" alias="color 9"/>
     <ColorAlias name="midi note velocity text" alias="color 32"/>
     <ColorAlias name="midi patch change fill" alias="color 60"/>

diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 29cb9be77ae76be82093dd01431a61375d23963c..a39661e7806a4c70ac1e99206cb3096af2002e30 100644 (file)
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -282,7 +282,6 @@
                <ColorAlias name="midi meter color8" alias="meter color8"/>
                <ColorAlias name="midi meter color9" alias="meter color9"/>
                <ColorAlias name="midi note inactive channel" alias="color 4"/>
-               <ColorAlias name="midi note selected" alias="meter color7"/>
                <ColorAlias name="midi note selected outline" alias="color 105"/>
                <ColorAlias name="midi note velocity text" alias="color 2"/>
                <ColorAlias name="midi patch change fill" alias="color 105"/>