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/ardour/types.h | |
| 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/ardour/types.h')
| -rw-r--r-- | libs/ardour/ardour/types.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index b5e5d89cc1..c2c7289329 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -409,12 +409,6 @@ namespace ARDOUR { ShortCrossfade }; - enum LayerModel { - LaterHigher, - AddOrBoundsChangeHigher, - AddHigher - }; - enum ListenPosition { AfterFaderListen, PreFaderListen @@ -592,11 +586,6 @@ namespace ARDOUR { FadeLogB }; - enum LayerOp { - LayerOpAdd, - LayerOpBoundsChange - }; - } // namespace ARDOUR @@ -613,7 +602,6 @@ std::istream& operator>>(std::istream& o, ARDOUR::PFLPosition& sf); std::istream& operator>>(std::istream& o, ARDOUR::AFLPosition& sf); std::istream& operator>>(std::istream& o, ARDOUR::RemoteModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::ListenPosition& sf); -std::istream& operator>>(std::istream& o, ARDOUR::LayerModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::InsertMergePolicy& sf); std::istream& operator>>(std::istream& o, ARDOUR::CrossfadeModel& sf); std::istream& operator>>(std::istream& o, ARDOUR::SyncSource& sf); @@ -634,7 +622,6 @@ std::ostream& operator<<(std::ostream& o, const ARDOUR::PFLPosition& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::AFLPosition& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::RemoteModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::ListenPosition& sf); -std::ostream& operator<<(std::ostream& o, const ARDOUR::LayerModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::InsertMergePolicy& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::CrossfadeModel& sf); std::ostream& operator<<(std::ostream& o, const ARDOUR::SyncSource& sf); |