diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
| commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
| tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /libs/ardour/enums.cc | |
| parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) | |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/enums.cc')
| -rw-r--r-- | libs/ardour/enums.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index cde3f418fd..5987c874fb 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -83,7 +83,6 @@ setup_enum_writer () TimecodeFormat _Session_TimecodeFormat; Session::PullupFormat _Session_PullupFormat; FadeShape _FadeShape; - Panner::LinkDirection _Panner_LinkDirection; IOChange _IOChange; AutomationType _AutomationType; AutoState _AutoState; @@ -135,7 +134,9 @@ setup_enum_writer () REGISTER (_OverlapType); REGISTER_ENUM (GainAutomation); - REGISTER_ENUM (PanAutomation); + REGISTER_ENUM (PanAzimuthAutomation); + REGISTER_ENUM (PanElevationAutomation); + REGISTER_ENUM (PanWidthAutomation); REGISTER_ENUM (PluginAutomation); REGISTER_ENUM (SoloAutomation); REGISTER_ENUM (MuteAutomation); @@ -410,10 +411,6 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Location, IsRangeMarker); REGISTER_BITS (_Location_Flags); - REGISTER_CLASS_ENUM (Panner, SameDirection); - REGISTER_CLASS_ENUM (Panner, OppositeDirection); - REGISTER (_Panner_LinkDirection); - REGISTER_CLASS_ENUM (Track, NoFreeze); REGISTER_CLASS_ENUM (Track, Frozen); REGISTER_CLASS_ENUM (Track, UnFrozen); |