trim typo and details

[ardour.git] / gtk2_ardour / session_option_editor.cc

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 51f30b6a6187841e0f217cafd7995e7e19553f70..d3f6aa2c7f3e6f8c1dda1a3af40e825855e2456b 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -132,18 +132,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        /* FADES */
 
-       ComboOption<CrossfadeChoice>* cfc = new ComboOption<CrossfadeChoice> (
-               "xfade-choice",
-               _("Default crossfade type"),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfade_choice),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfade_choice)
-               );
-
-       cfc->add (ConstantPowerMinus3dB, _("Constant power (-3dB) crossfade"));
-       cfc->add (ConstantPowerMinus6dB, _("Linear (-6dB) crossfade"));
-
-       add_option (_("Fades"), cfc);
-
        add_option (_("Fades"), new SpinOption<float> (
                _("destructive-xfade-seconds"),
                _("Destructive crossfade length"),
@@ -219,7 +207,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        BoolOption *bo;
 
-       bo = new BoolOption (
+       bo = new RouteDisplayBoolOption (
                        "track-name-number",
                        _("Prefix Track number"),
                        sigc::mem_fun (*_session_config, &SessionConfiguration::get_track_name_number),
@@ -407,7 +395,7 @@ SessionOptionEditor::parameter_changed (std::string const & p)
 bool
 SessionOptionEditor::set_use_monitor_section (bool yn)
 {
-       bool had_monitor_section = _session->monitor_out();
+       bool had_monitor_section = _session->monitor_out() != 0;
 
        if (yn) {
                _session->add_monitor_section ();