ardour/livetrax
13
0
Fork 0
Code

Remove some unused PostTransport enums and renumber others.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9767 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-06-26 12:56:40 +00:00
parent 2aa006d749
commit 4388556923
2 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libs/ardour/ardour/session.h
View File

@ -760,23 +760,19 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
enum PostTransportWork { enum PostTransportWork {
PostTransportStop = 0x1, PostTransportStop = 0x1,
PostTransportDisableRecord = 0x2, PostTransportDuration = 0x2,
PostTransportPosition = 0x8, PostTransportLocate = 0x4,
PostTransportDidRecord = 0x20, PostTransportRoll = 0x8,
PostTransportDuration = 0x40, PostTransportAbort = 0x10,
PostTransportLocate = 0x80, PostTransportOverWrite = 0x20,
PostTransportRoll = 0x200, PostTransportSpeed = 0x40,
PostTransportAbort = 0x800, PostTransportAudition = 0x80,
PostTransportOverWrite = 0x1000, PostTransportReverse = 0x100,
PostTransportSpeed = 0x2000, PostTransportInputChange = 0x200,
PostTransportAudition = 0x4000, PostTransportCurveRealloc = 0x400,
PostTransportScrub = 0x8000, PostTransportClearSubstate = 0x800,
PostTransportReverse = 0x10000, PostTransportAdjustPlaybackBuffering = 0x1000,
PostTransportInputChange = 0x20000, PostTransportAdjustCaptureBuffering = 0x2000
PostTransportCurveRealloc = 0x40000,
PostTransportClearSubstate = 0x80000,
PostTransportAdjustPlaybackBuffering = 0x100000,
PostTransportAdjustCaptureBuffering = 0x200000
}; };
enum SlaveState { enum SlaveState {
@ -1024,33 +1020,12 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi
Butler* _butler; 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 = static const PostTransportWork ProcessCannotProceedMask =
PostTransportWork ( PostTransportWork (
PostTransportInputChange| PostTransportInputChange|
PostTransportSpeed| PostTransportSpeed|
PostTransportReverse| PostTransportReverse|
PostTransportCurveRealloc| PostTransportCurveRealloc|
PostTransportScrub|
PostTransportAudition| PostTransportAudition|
PostTransportLocate| PostTransportLocate|
PostTransportStop| PostTransportStop|

4
libs/ardour/enums.cc
View File

@ -344,9 +344,6 @@ setup_enum_writer ()
REGISTER (_MIDI_MTC_Status); REGISTER (_MIDI_MTC_Status);
REGISTER_CLASS_ENUM (Session, PostTransportStop); 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, PostTransportDuration);
REGISTER_CLASS_ENUM (Session, PostTransportLocate); REGISTER_CLASS_ENUM (Session, PostTransportLocate);
REGISTER_CLASS_ENUM (Session, PostTransportRoll); REGISTER_CLASS_ENUM (Session, PostTransportRoll);
@ -354,7 +351,6 @@ setup_enum_writer ()
REGISTER_CLASS_ENUM (Session, PostTransportOverWrite); REGISTER_CLASS_ENUM (Session, PostTransportOverWrite);
REGISTER_CLASS_ENUM (Session, PostTransportSpeed); REGISTER_CLASS_ENUM (Session, PostTransportSpeed);
REGISTER_CLASS_ENUM (Session, PostTransportAudition); REGISTER_CLASS_ENUM (Session, PostTransportAudition);
REGISTER_CLASS_ENUM (Session, PostTransportScrub);
REGISTER_CLASS_ENUM (Session, PostTransportReverse); REGISTER_CLASS_ENUM (Session, PostTransportReverse);
REGISTER_CLASS_ENUM (Session, PostTransportInputChange); REGISTER_CLASS_ENUM (Session, PostTransportInputChange);
REGISTER_CLASS_ENUM (Session, PostTransportCurveRealloc); REGISTER_CLASS_ENUM (Session, PostTransportCurveRealloc);