retire no-longer used color names for MIDI notes

diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 8c944c9d55a4af64960c9fe0f27b153b119c396a..b5d70c1a814e0aa761142078d5927e97a1c5d522 100644 (file)
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -48,9 +48,6 @@ 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;
-uint32_t NoteBase::_min_col = 0;
-uint32_t NoteBase::_mid_col = 0;
-uint32_t NoteBase::_max_col = 0;
 
 void
 NoteBase::set_colors ()
@@ -58,9 +55,6 @@ 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");
-       _min_col = UIConfiguration::instance().color_mod ("midi note min", "midi note");
-       _mid_col = UIConfiguration::instance().color_mod ("midi note mid", "midi note");
-       _max_col = UIConfiguration::instance().color_mod ("midi note max", "midi note");
 }
 
 NoteBase::NoteBase(MidiRegionView& region, bool with_events, const boost::shared_ptr<NoteType> note)

diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h
index 2a3612579dfac39f7ee3f54a5e22a6d8d9cc3f9e..f72f71181b7f71bcad27a91dc786fd80ca50af57 100644 (file)
--- a/gtk2_ardour/note_base.h
+++ b/gtk2_ardour/note_base.h
@@ -143,9 +143,6 @@ private:
        static uint32_t _selected_mod_col;
        static uint32_t _selected_outline_col;
        static uint32_t _selected_col;
-       static uint32_t _min_col;
-       static uint32_t _mid_col;
-       static uint32_t _max_col;
        static bool _color_init;
 };
 

diff --git a/gtk2_ardour/themes/blueberry_milk-ardour.colors b/gtk2_ardour/themes/blueberry_milk-ardour.colors
index b3b99bbb15e881d898b5cb978361f490fd2ce90b..166a13fba6ccf1cf137ea6f756d0496f1e0a33ca 100644 (file)
--- a/gtk2_ardour/themes/blueberry_milk-ardour.colors
+++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors
@@ -277,9 +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 max" alias="color 67"/>
-    <ColorAlias name="midi note mid" alias="color 93"/>
-    <ColorAlias name="midi note min" alias="color 13"/>
     <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"/>

diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors
index 6cfdc2e761754ae033d2896c707e6b8bbb8ae89e..388f4a02058ffed07e11b225886e52122a0b72fb 100644 (file)
--- a/gtk2_ardour/themes/caineville-ardour.colors
+++ b/gtk2_ardour/themes/caineville-ardour.colors
@@ -277,9 +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 max" alias="color 8"/>
-    <ColorAlias name="midi note mid" alias="color 91"/>
-    <ColorAlias name="midi note min" alias="color 49"/>
     <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"/>

diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors
index 398a01fba11979446438baffb06cd7adc1182c08..f0f3b7ca091f81d59912f38859ee83403e28848f 100644 (file)
--- a/gtk2_ardour/themes/clear_gray-ardour.colors
+++ b/gtk2_ardour/themes/clear_gray-ardour.colors
@@ -277,9 +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 max" alias="color 67"/>
-    <ColorAlias name="midi note mid" alias="color 87"/>
-    <ColorAlias name="midi note min" alias="color 49"/>
     <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"/>

diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors
index 8224ef3140f55c74fa9e2ff8370d0c4cddad36a3..7a38d564f2b17abc6842535e013739072a664c32 100644 (file)
--- a/gtk2_ardour/themes/cubasish-ardour.colors
+++ b/gtk2_ardour/themes/cubasish-ardour.colors
@@ -277,9 +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 max" alias="color 8"/>
-    <ColorAlias name="midi note mid" alias="color 91"/>
-    <ColorAlias name="midi note min" alias="color 49"/>
     <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"/>

diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors
index 3e1f0ba928fad06fe04af01aef51c0fa8d79b31e..c3d7d61b906017be9b3da4c1a00dd591f73068ea 100644 (file)
--- a/gtk2_ardour/themes/dark-ardour.colors
+++ b/gtk2_ardour/themes/dark-ardour.colors
@@ -279,9 +279,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 max" alias="color 8"/>
-    <ColorAlias name="midi note mid" alias="color 96"/>
-    <ColorAlias name="midi note min" alias="color 103"/>
     <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"/>

diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors
index 4c302dfc40f06ba44a832041cbda8607850b685d..29cb9be77ae76be82093dd01431a61375d23963c 100644 (file)
--- a/gtk2_ardour/themes/unastudia-ardour.colors
+++ b/gtk2_ardour/themes/unastudia-ardour.colors
@@ -282,9 +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 max" alias="color 108"/>
-               <ColorAlias name="midi note mid" alias="color 108"/>
-               <ColorAlias name="midi note min" alias="color 108"/>
                <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"/>