Remove unused options related to crossfades.

git-svn-id: svn://localhost/ardour2/branches/3.0@12120 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index fe9e06c3a3aff5c12a665d34f79e4042e5b1e1ac..0eb945a2d9c54a0ca62d36d093d067cb44abf37f 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -192,20 +192,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_xfade)
                            ));
 
-        add_option (_("Fades"), new BoolOption (
-                           "xfades-active",
-                           _("Crossfades active"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfades_active),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfades_active)
-                           ));
-
-       add_option (_("Fades"), new BoolOption (
-                           "xfades-visible",
-                           _("Crossfades visible"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfades_visible),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfades_visible)
-                           ));
-
        add_option (_("Fades"), new BoolOption (
                            "use-region-fades",
                            _("Region fades active"),

diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h
index 16ce36020b540fce97edc369862938e7399b5d47..489105e5acd93d0f45b70a43fcc8c96dbe63f649 100644 (file)
--- a/libs/ardour/ardour/session_configuration_vars.h
+++ b/libs/ardour/ardour/session_configuration_vars.h
@@ -29,8 +29,6 @@ CONFIG_VARIABLE (CrossfadeModel, xfade_model, "xfade-model", FullCrossfade)
 CONFIG_VARIABLE (CrossfadeChoice, xfade_choice, "xfade-choice", ConstantPowerMinus3dB)
 CONFIG_VARIABLE (bool, auto_xfade, "auto-xfade", true)
 CONFIG_VARIABLE (float, short_xfade_seconds, "short-xfade-seconds", 0.015)
-CONFIG_VARIABLE (bool, xfades_active, "xfades-active", true)
-CONFIG_VARIABLE (bool, xfades_visible, "xfades-visible", true)
 CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs,  "destructive-xfade-msecs", 2)
 CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true)
 CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true)