smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

clean up cruft in some config variables

Browse source
This commit is contained in:
Ben Loftis 2014-07-28 15:55:20 -05:00
parent fb77669ee5
commit ed07c53210
7 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/ardour_ui_options.cc
View file

@ -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);

2
gtk2_ardour/editor.cc
View file

@ -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");
}
}

11
gtk2_ardour/mixer_strip.cc
View file

@ -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 ();
}

2
gtk2_ardour/mixer_strip.h
View file

@ -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;

7
gtk2_ardour/mixer_ui.cc
View file

@ -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();
}

5
gtk2_ardour/rc_option_editor.cc
View file

@ -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"));

2
libs/ardour/ardour/rc_configuration_vars.h
View file

@ -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)