diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-12-29 22:14:15 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-12-29 22:14:15 +0000 |
| commit | b1775149307a157444c516693ad6b98a404ef1b2 (patch) | |
| tree | ffdf04d8396cf53d5378c073a8d249150d5282eb /libs/ardour/enums.cc | |
| parent | cabb76cce6203d34299136371078bd20b6abe1e3 (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 'libs/ardour/enums.cc')
| -rw-r--r-- | libs/ardour/enums.cc | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 12de366c79..fcf3b031ad 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -73,7 +73,6 @@ setup_enum_writer () RemoteModel _RemoteModel; DenormalModel _DenormalModel; CrossfadeModel _CrossfadeModel; - LayerModel _LayerModel; InsertMergePolicy _InsertMergePolicy; ListenPosition _ListenPosition; SampleFormat _SampleFormat; @@ -264,11 +263,6 @@ setup_enum_writer () REGISTER_ENUM (ShortCrossfade); REGISTER (_CrossfadeModel); - REGISTER_ENUM (LaterHigher); - REGISTER_ENUM (AddOrBoundsChangeHigher); - REGISTER_ENUM (AddHigher); - REGISTER (_LayerModel); - REGISTER_ENUM (InsertMergeReject); REGISTER_ENUM (InsertMergeRelax); REGISTER_ENUM (InsertMergeReplace); @@ -711,19 +705,6 @@ std::ostream& operator<<(std::ostream& o, const ListenPosition& var) std::string s = enum_2_string (var); return o << s; } -std::istream& operator>>(std::istream& o, LayerModel& var) -{ - std::string s; - o >> s; - var = (LayerModel) string_2_enum (s, var); - return o; -} - -std::ostream& operator<<(std::ostream& o, const LayerModel& var) -{ - std::string s = enum_2_string (var); - return o << s; -} std::istream& operator>>(std::istream& o, InsertMergePolicy& var) { |