Revert internals of the last layering-related commit, and go back a slightly-cleaned...

[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 6ffb95b4645c05d806c5cb1edb783a6c61f04eca..dc72e6a0450fe165d95f32af32b9796d2312bb23 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -262,29 +262,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
         /* Misc */
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Layering (in overlaid mode)")));
-
-       ComboOption<LayerModel>* lm = new ComboOption<LayerModel> (
-               "layer-model",
-               _("Layering model"),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::get_layer_model),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::set_layer_model)
-               );
-
-       lm->add (LaterHigher, _("later is higher"));
-       lm->add (AddOrBoundsChangeHigher, _("most recently edited or added is higher"));
-       lm->add (AddHigher, _("most recently added is higher"));
-
-       add_option (_("Misc"), new BoolOption (
-                           "relayer-on-all-edits",
-                           _("Relayer regions after every edit"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_relayer_on_all_edits),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_relayer_on_all_edits)
-                           ));
-                           
-
-       add_option (_("Misc"), lm);
-
        add_option (_("Misc"), new OptionEditorHeading (_("MIDI Options")));
 
         add_option (_("Misc"), new BoolOption (