diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 17:04:06 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-02-22 17:04:06 +0000 |
commit | 14277ff831c90dbdd1131a44eac86da919bb0544 (patch) | |
tree | 2c33ee003e20649dccda5cdf242933962fa9feec /libs/ardour/enums.cc | |
parent | 3bed0850babcdb68ecc61b5957349ba353605270 (diff) |
Add AFLFrom... enums as counterpart to PFLFrom ; add Output metering as a new fixed meter point; clean up logic in Route::setup_invisible_processors() to correctly place meters and monitor sends in various modes
git-svn-id: svn://localhost/ardour2/branches/3.0@8923 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/enums.cc')
-rw-r--r-- | libs/ardour/enums.cc | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index 5219b51458..a524db3d23 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -66,6 +66,7 @@ setup_enum_writer () Placement _Placement; MonitorModel _MonitorModel; PFLPosition _PFLPosition; + AFLPosition _AFLPosition; RemoteModel _RemoteModel; DenormalModel _DenormalModel; CrossfadeModel _CrossfadeModel; @@ -164,6 +165,7 @@ setup_enum_writer () REGISTER_ENUM (MeterInput); REGISTER_ENUM (MeterPreFader); REGISTER_ENUM (MeterPostFader); + REGISTER_ENUM (MeterOutput); REGISTER_ENUM (MeterCustom); REGISTER (_MeterPoint); @@ -224,6 +226,10 @@ setup_enum_writer () REGISTER_ENUM (PFLFromAfterProcessors); REGISTER (_PFLPosition); + REGISTER_ENUM (AFLFromBeforeProcessors); + REGISTER_ENUM (AFLFromAfterProcessors); + REGISTER (_AFLPosition); + REGISTER_ENUM (DenormalNone); REGISTER_ENUM (DenormalFTZ); REGISTER_ENUM (DenormalDAZ); @@ -637,6 +643,20 @@ std::ostream& operator<<(std::ostream& o, const PFLPosition& var) return o << s; } +std::istream& operator>>(std::istream& o, AFLPosition& var) +{ + std::string s; + o >> s; + var = (AFLPosition) string_2_enum (s, var); + return o; +} + +std::ostream& operator<<(std::ostream& o, const AFLPosition& var) +{ + std::string s = enum_2_string (var); + return o << s; +} + std::istream& operator>>(std::istream& o, RemoteModel& var) { std::string s; |