clean up cruft in some config variables

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 79f44a511683aa7a39e8dc3f7148a51ca652cc91..5193969a054cc03657685b3381506f5aa9d327e9 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -326,7 +326,7 @@ ARDOUR_UI::parameter_changed (std::string p)
                        ActionManager::get_action ("Transport", "ToggleFollowEdits")->set_sensitive (false);
                }
 
-       } else if (p == "always-play-range") {
+       } else if (p == "follow-edits") {
 
                ActionManager::map_some_state ("Transport", "ToggleFollowEdits", &RCConfiguration::get_follow_edits);
 

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ad920683b84624e29c8e2d2d1b0901b37bc215a2..9bd76efffbe24b8f94d22809d5ef46ac603ca5a7 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -919,7 +919,7 @@ Editor::show_window ()
 
                if (current_mixer_strip) {
                        current_mixer_strip->hide_things ();
-                       current_mixer_strip->parameter_changed ("mixer-strip-visibility");
+                       current_mixer_strip->parameter_changed ("mixer-element-visibility");
                }
        }
 

diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 09398d554785460935022be1ed34d0217820d05e..c097cd8f26a3fd048ee53ca518d4b740b6530c5e 100644 (file)
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -97,7 +97,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, bool in_mixer)
        , meter_point_button (_("pre"))
        , midi_input_enable_button (0)
        , _comment_button (_("Comments"))
-       , _visibility (X_("mixer-strip-visibility"))
+       , _visibility (X_("mixer-element-visibility"))
 {
        init ();
 
@@ -127,7 +127,7 @@ MixerStrip::MixerStrip (Mixer_UI& mx, Session* sess, boost::shared_ptr<Route> rt
        , meter_point_button (_("pre"))
        , midi_input_enable_button (0)
        , _comment_button (_("Comments"))
-       , _visibility (X_("mixer-strip-visibility"))
+       , _visibility (X_("mixer-element-visibility"))
 {
        init ();
        set_route (rt);
@@ -383,15 +383,14 @@ MixerStrip::init ()
           must be the same as those used in RCOptionEditor so that the configuration changes
           are recognised when they occur.
        */
+       _visibility.add (&input_button, X_("Input"), _("Input"), false);
        _visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"), false);
        _visibility.add (&rec_mon_table, X_("RecMon"), _("Record & Monitor"), false);
        _visibility.add (&solo_iso_table, X_("SoloIsoLock"), _("Solo Iso / Lock"), false);
-       _visibility.add (&group_button, X_("Group"), _("Group"), false);
-       _visibility.add (&meter_point_button, X_("MeterPoint"), _("Meter Point"), false);
        _visibility.add (&output_button, X_("Output"), _("Output"), false);
        _visibility.add (&_comment_button, X_("Comments"), _("Comments"), false);
 
-       parameter_changed (X_("mixer-strip-visibility"));
+       parameter_changed (X_("mixer-element-visibility"));
 
        Config->ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
        _session->config.ParameterChanged.connect (_config_connection, MISSING_INVALIDATOR, boost::bind (&MixerStrip::parameter_changed, this, _1), gui_context());
@@ -672,7 +671,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
        group_button.show();
        gpm.gain_automation_state_button.show();
 
-       parameter_changed ("mixer-strip-visibility");
+       parameter_changed ("mixer-element-visibility");
 
        show ();
 }

diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index eac39b3bee68632f4e0b6989cf0c066b7be57053..f7c7977a535914ffbd8818d491b760ffed2e60fc 100644 (file)
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -308,7 +308,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
         *  We fill it with the controls that are being managed, using the same names
         *  as those used with _mixer_strip_visibility in RCOptionEditor.  Then
         *  this VisibilityGroup is configured by changes to the RC variable
-        *  mixer-strip-visibility, which happen when the user makes changes in
+        *  mixer-element-visibility, which happen when the user makes changes in
         *  the RC option editor.
         */
        VisibilityGroup _visibility;

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 256a5cc91fa8a5105e14e6ef3c829270d7c27698..474d2c00a223d9452960f86780fea051d5c8ab00 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -293,7 +293,7 @@ Mixer_UI::show_window ()
                        ms = (*ri)[track_columns.strip];
                        ms->set_width_enum (ms->get_width_enum (), ms->width_owner());
                        /* Fix visibility of mixer strip stuff */
-                       ms->parameter_changed (X_("mixer-strip-visibility"));
+                       ms->parameter_changed (X_("mixer-element-visibility"));
                }
        }
        
@@ -415,10 +415,7 @@ Mixer_UI::deselect_all_strip_processors ()
 void
 Mixer_UI::select_none ()
 {
-       for (list<MixerStrip *>::iterator i = strips.begin(); i != strips.end(); ++i) {
-               (*i)->set_selected(false);
-       }
-       
+       _selection.clear_routes();
        deselect_all_strip_processors();
 }
 

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index c7f48baf0bf3fed92299af9e2a294469e5b78ddf..2ceff7a30a0201d4c418ff3d6cdc12277f9c3c83 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1230,7 +1230,7 @@ private:
 RCOptionEditor::RCOptionEditor ()
        : OptionEditor (Config, string_compose (_("%1 Preferences"), PROGRAM_NAME))
         , _rc_config (Config)
-       , _mixer_strip_visibility ("mixer-strip-visibility")
+       , _mixer_strip_visibility ("mixer-element-visibility")
 {
        /* MISC */
 
@@ -2195,11 +2195,10 @@ RCOptionEditor::RCOptionEditor ()
        /* The names of these controls must be the same as those given in MixerStrip
           for the actual widgets being controlled.
        */
+       _mixer_strip_visibility.add (0, X_("Input"), _("Input"));
        _mixer_strip_visibility.add (0, X_("PhaseInvert"), _("Phase Invert"));
        _mixer_strip_visibility.add (0, X_("RecMon"), _("Record & Monitor"));
        _mixer_strip_visibility.add (0, X_("SoloIsoLock"), _("Solo Iso / Lock"));
-       _mixer_strip_visibility.add (0, X_("Group"), _("Group"));
-       _mixer_strip_visibility.add (0, X_("MeterPoint"), _("Meter Point"));
        _mixer_strip_visibility.add (0, X_("Output"), _("Output"));
        _mixer_strip_visibility.add (0, X_("Comments"), _("Comments"));
        

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index b03f4ce3e371d72c4a76184927cfb6fe37a0e71a..3489df6289e1ac6a7d12c156a0465a67ee5f7ddc 100644 (file)
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -225,7 +225,7 @@ CONFIG_VARIABLE (DenormalModel, denormal_model, "denormal-model", DenormalFTZDAZ
 CONFIG_VARIABLE (bool, show_zoom_tools, "show-zoom-tools", true)
 CONFIG_VARIABLE (bool, widget_prelight, "widget-prelight", true)
 CONFIG_VARIABLE (bool, use_tooltips, "use-tooltips", true)
-CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-strip-visibility", "Input,PhaseInvert,RecMon,SoloIsoLock,Group,MeterPoint,Output,Comments")
+CONFIG_VARIABLE (std::string, mixer_strip_visibility, "mixer-element-visibility", "Input,PhaseInvert,RecMon,SoloIsoLock,Output,Comments")
 CONFIG_VARIABLE (bool, allow_non_quarter_pulse, "allow-non-quarter-pulse", false)
 CONFIG_VARIABLE (bool, show_region_gain, "show-region-gain", false)
 CONFIG_VARIABLE (bool, show_name_highlight, "show-name-highlight", false)