From b0e496c82501c5bd44b9495bd9bd4c2077cf58c3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 5 Jul 2018 16:52:41 -0400 Subject: remove more unused MIDI note colors --- gtk2_ardour/midi_region_view.cc | 6 ++---- gtk2_ardour/note_base.cc | 24 +++++++++--------------- gtk2_ardour/note_base.h | 9 ++++----- gtk2_ardour/themes/blueberry_milk-ardour.colors | 1 - gtk2_ardour/themes/caineville-ardour.colors | 1 - gtk2_ardour/themes/clear_gray-ardour.colors | 1 - gtk2_ardour/themes/cubasish-ardour.colors | 1 - gtk2_ardour/themes/dark-ardour.colors | 1 - gtk2_ardour/themes/unastudia-ardour.colors | 1 - 9 files changed, 15 insertions(+), 30 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 5fc87cf8dd..1d74dd66a4 100644 --- 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 b5d70c1a81..2e900c354e 100644 --- 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 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 f72f71181b..7062884e5b 100644 --- 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 166a13fba6..6fb317d033 100644 --- a/gtk2_ardour/themes/blueberry_milk-ardour.colors +++ b/gtk2_ardour/themes/blueberry_milk-ardour.colors @@ -277,7 +277,6 @@ - diff --git a/gtk2_ardour/themes/caineville-ardour.colors b/gtk2_ardour/themes/caineville-ardour.colors index 388f4a0205..6998bc9855 100644 --- a/gtk2_ardour/themes/caineville-ardour.colors +++ b/gtk2_ardour/themes/caineville-ardour.colors @@ -277,7 +277,6 @@ - diff --git a/gtk2_ardour/themes/clear_gray-ardour.colors b/gtk2_ardour/themes/clear_gray-ardour.colors index f0f3b7ca09..49e61e3e92 100644 --- a/gtk2_ardour/themes/clear_gray-ardour.colors +++ b/gtk2_ardour/themes/clear_gray-ardour.colors @@ -277,7 +277,6 @@ - diff --git a/gtk2_ardour/themes/cubasish-ardour.colors b/gtk2_ardour/themes/cubasish-ardour.colors index 7a38d564f2..e7b8a9b2b3 100644 --- a/gtk2_ardour/themes/cubasish-ardour.colors +++ b/gtk2_ardour/themes/cubasish-ardour.colors @@ -277,7 +277,6 @@ - diff --git a/gtk2_ardour/themes/dark-ardour.colors b/gtk2_ardour/themes/dark-ardour.colors index 9f969a9fec..d8fd0bee44 100644 --- a/gtk2_ardour/themes/dark-ardour.colors +++ b/gtk2_ardour/themes/dark-ardour.colors @@ -285,7 +285,6 @@ - diff --git a/gtk2_ardour/themes/unastudia-ardour.colors b/gtk2_ardour/themes/unastudia-ardour.colors index 29cb9be77a..a39661e780 100644 --- a/gtk2_ardour/themes/unastudia-ardour.colors +++ b/gtk2_ardour/themes/unastudia-ardour.colors @@ -282,7 +282,6 @@ - -- cgit v1.2.3