diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-13 21:55:17 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-04-13 21:57:35 -0400 |
| commit | 05cd32a9f01cfac9cc272b0e518ac7268f6e7f2e (patch) | |
| tree | 575f07ff0fc0fc18da9c0780e1e8cf21592dc6ea | |
| parent | d00ab0221ad6e257fe9868890b54324454b6462b (diff) | |
remove UI configuration variable link-editor-and-mixer-selection, and make behaviour be equivalent to this option always being true
| -rw-r--r-- | gtk2_ardour/editor_mixer.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config_vars.h | 1 |
4 files changed, 2 insertions, 11 deletions
diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index a2a8189683..071dca9793 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -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; } diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index d6ed651e48..54d97c36de 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -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; } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 4f94b165b0..13f425883e 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -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"), diff --git a/gtk2_ardour/ui_config_vars.h b/gtk2_ardour/ui_config_vars.h index 67c4f276e3..8c6f7bff88 100644 --- a/gtk2_ardour/ui_config_vars.h +++ b/gtk2_ardour/ui_config_vars.h @@ -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) |