diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-06-26 12:56:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-06-26 12:56:40 +0000 |
| commit | 4388556923da8b174fdbea445ea20a8eb72189c6 (patch) | |
| tree | 11b9246389aba05ec2d0275c4a2732198295d016 | |
| parent | 2aa006d749f1abae3a401beda2806669dcc6a28d (diff) | |
Remove some unused PostTransport enums and renumber others.
git-svn-id: svn://localhost/ardour2/branches/3.0@9767 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/ardour/session.h | 51 | ||||
| -rw-r--r-- | libs/ardour/enums.cc | 4 |
2 files changed, 13 insertions, 42 deletions
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index e1e693510a..004ff41f83 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -760,23 +760,19 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi enum PostTransportWork { PostTransportStop = 0x1, - PostTransportDisableRecord = 0x2, - PostTransportPosition = 0x8, - PostTransportDidRecord = 0x20, - PostTransportDuration = 0x40, - PostTransportLocate = 0x80, - PostTransportRoll = 0x200, - PostTransportAbort = 0x800, - PostTransportOverWrite = 0x1000, - PostTransportSpeed = 0x2000, - PostTransportAudition = 0x4000, - PostTransportScrub = 0x8000, - PostTransportReverse = 0x10000, - PostTransportInputChange = 0x20000, - PostTransportCurveRealloc = 0x40000, - PostTransportClearSubstate = 0x80000, - PostTransportAdjustPlaybackBuffering = 0x100000, - PostTransportAdjustCaptureBuffering = 0x200000 + PostTransportDuration = 0x2, + PostTransportLocate = 0x4, + PostTransportRoll = 0x8, + PostTransportAbort = 0x10, + PostTransportOverWrite = 0x20, + PostTransportSpeed = 0x40, + PostTransportAudition = 0x80, + PostTransportReverse = 0x100, + PostTransportInputChange = 0x200, + PostTransportCurveRealloc = 0x400, + PostTransportClearSubstate = 0x800, + PostTransportAdjustPlaybackBuffering = 0x1000, + PostTransportAdjustCaptureBuffering = 0x2000 }; enum SlaveState { @@ -1024,33 +1020,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi Butler* _butler; -#if 0 // these should be here, see comments in their other location above - enum PostTransportWork { - PostTransportStop = 0x1, - PostTransportDisableRecord = 0x2, - PostTransportPosition = 0x8, - PostTransportDidRecord = 0x20, - PostTransportDuration = 0x40, - PostTransportLocate = 0x80, - PostTransportRoll = 0x200, - PostTransportAbort = 0x800, - PostTransportOverWrite = 0x1000, - PostTransportSpeed = 0x2000, - PostTransportAudition = 0x4000, - PostTransportScrub = 0x8000, - PostTransportReverse = 0x10000, - PostTransportInputChange = 0x20000, - PostTransportCurveRealloc = 0x40000, - PostTransportClearSubstate = 0x80000 - }; -#endif static const PostTransportWork ProcessCannotProceedMask = PostTransportWork ( PostTransportInputChange| PostTransportSpeed| PostTransportReverse| PostTransportCurveRealloc| - PostTransportScrub| PostTransportAudition| PostTransportLocate| PostTransportStop| diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index d172e65f5f..8fd008c119 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -344,9 +344,6 @@ setup_enum_writer () REGISTER (_MIDI_MTC_Status); REGISTER_CLASS_ENUM (Session, PostTransportStop); - REGISTER_CLASS_ENUM (Session, PostTransportDisableRecord); - REGISTER_CLASS_ENUM (Session, PostTransportPosition); - REGISTER_CLASS_ENUM (Session, PostTransportDidRecord); REGISTER_CLASS_ENUM (Session, PostTransportDuration); REGISTER_CLASS_ENUM (Session, PostTransportLocate); REGISTER_CLASS_ENUM (Session, PostTransportRoll); @@ -354,7 +351,6 @@ setup_enum_writer () REGISTER_CLASS_ENUM (Session, PostTransportOverWrite); REGISTER_CLASS_ENUM (Session, PostTransportSpeed); REGISTER_CLASS_ENUM (Session, PostTransportAudition); - REGISTER_CLASS_ENUM (Session, PostTransportScrub); REGISTER_CLASS_ENUM (Session, PostTransportReverse); REGISTER_CLASS_ENUM (Session, PostTransportInputChange); REGISTER_CLASS_ENUM (Session, PostTransportCurveRealloc); |