ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove UI configuration variable link-editor-and-mixer-selection, and make behaviour be equivalent to this option always being true

Browse Source
This commit is contained in:
Paul Davis 2015-04-13 21:55:17 -04:00
parent d00ab0221a
commit 05cd32a9f0
4 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_mixer.cc
View File

@ -283,7 +283,7 @@ Editor::track_mixer_selection ()
void
Editor::follow_mixer_selection ()
{
if (!ARDOUR_UI::config()->get_link_editor_and_mixer_selection() || _following_mixer_selection) {
if (_following_mixer_selection) {
return;
}

2
gtk2_ardour/mixer_ui.cc
View File

@ -630,7 +630,7 @@ Mixer_UI::sync_treeview_from_order_keys ()
void
Mixer_UI::follow_editor_selection ()
{
if (!ARDOUR_UI::config()->get_link_editor_and_mixer_selection() || _following_editor_selection) {
if (_following_editor_selection) {
return;
}

8
gtk2_ardour/rc_option_editor.cc
View File

@ -1754,14 +1754,6 @@ RCOptionEditor::RCOptionEditor ()
sigc::mem_fun (*_ui_config, &UIConfiguration::set_update_editor_during_summary_drag)
));
add_option (_("Editor"),
new BoolOption (
"link-editor-and-mixer-selection",
_("Synchronise editor and mixer selection"),
sigc::mem_fun (*_ui_config, &UIConfiguration::get_link_editor_and_mixer_selection),
sigc::mem_fun (*_ui_config, &UIConfiguration::set_link_editor_and_mixer_selection)
));
bo = new BoolOption (
"name-new-markers",
_("Name new markers"),

1
gtk2_ardour/ui_config_vars.h
View File

@ -61,7 +61,6 @@ UI_CONFIG_VARIABLE (bool, follow_edits, "follow-edits", false)
UI_CONFIG_VARIABLE (bool, super_rapid_clock_update, "super-rapid-clock-update", false)
UI_CONFIG_VARIABLE (bool, autoscroll_editor, "autoscroll-editor", true)
UI_CONFIG_VARIABLE (bool, link_region_and_track_selection, "link-region-and-track-selection", false) // DEPRECATED
UI_CONFIG_VARIABLE (bool, link_editor_and_mixer_selection, "link-editor-and-mixer-selection", false)
UI_CONFIG_VARIABLE (float, meter_hold, "meter-hold", 100.0f)
UI_CONFIG_VARIABLE (ARDOUR::VUMeterStandard, meter_vu_standard, "meter-vu-standard", ARDOUR::MeteringVUstandard)
UI_CONFIG_VARIABLE (ARDOUR::MeterLineUp, meter_line_up_level, "meter-line-up-level", ARDOUR::MeteringLineUp18)