summaryrefslogtreecommitdiff
path: root/gtk2_ardour/session_option_editor.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2011-12-29 22:14:15 +0000
committerCarl Hetherington <carl@carlh.net>2011-12-29 22:14:15 +0000
commitb1775149307a157444c516693ad6b98a404ef1b2 (patch)
treeffdf04d8396cf53d5378c073a8d249150d5282eb /gtk2_ardour/session_option_editor.cc
parentcabb76cce6203d34299136371078bd20b6abe1e3 (diff)
Revert internals of the last layering-related commit, and go back a slightly-cleaned-up version of how it was before. Remove all layering modes; only option now is add-is-higher. Move-add-higher could easily be re-added if anyone uses it.
git-svn-id: svn://localhost/ardour2/branches/3.0@11111 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/session_option_editor.cc')
-rw-r--r--gtk2_ardour/session_option_editor.cc23
1 files changed, 0 insertions, 23 deletions
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index 6ffb95b464..dc72e6a045 100644
--- 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 (