fix unintentionally edited color/theme name from f2s edit

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 9e8ba910adf41012498ce3d95743fd30ccd88760..b9a78c7373e2dc54e01020456930a38b74dba0b9 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -83,7 +83,7 @@ AutomationRegionView::init (bool /*wfd*/)
 
        set_height (trackview.current_height());
 
-       fill_color_name = "midi sample base";
+       fill_color_name = "midi frame base";
        set_colors ();
 
        _enable_display = true;
@@ -110,11 +110,11 @@ AutomationRegionView::get_fill_color() const
 {
        const std::string mod_name = (_dragging ? "dragging region" :
                                      trackview.editor().internal_editing() ? "editable region" :
-                                     "midi sample base");
+                                     "midi frame base");
        if (_selected) {
                return UIConfiguration::instance().color_mod ("selected region base", mod_name);
        } else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) {
-               return UIConfiguration::instance().color_mod ("midi sample base", mod_name);
+               return UIConfiguration::instance().color_mod ("midi frame base", mod_name);
        }
        return UIConfiguration::instance().color_mod (fill_color, mod_name);
 }

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c751c5f58b54071c104446891a14353246ee52a9..081315dcefcccb2fee82b655abeed1e90930bfa3 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -269,7 +269,7 @@ MidiRegionView::init (bool wfd)
 
        _model = midi_region()->midi_source(0)->model();
        _enable_display = false;
-       fill_color_name = "midi sample base";
+       fill_color_name = "midi frame base";
 
        RegionView::init (false);
 
@@ -3643,12 +3643,12 @@ MidiRegionView::get_fill_color() const
 {
        const std::string mod_name = (_dragging ? "dragging region" :
                                      trackview.editor().internal_editing() ? "editable region" :
-                                     "midi sample base");
+                                     "midi frame base");
        if (_selected) {
                return UIConfiguration::instance().color_mod ("selected region base", mod_name);
        } else if ((!UIConfiguration::instance().get_show_name_highlight() || high_enough_for_name) &&
                   !UIConfiguration::instance().get_color_regions_using_track_color()) {
-               return UIConfiguration::instance().color_mod ("midi sample base", mod_name);
+               return UIConfiguration::instance().color_mod ("midi frame base", mod_name);
        }
        return UIConfiguration::instance().color_mod (fill_color, mod_name);
 }