ardour/livetrax
13
0
Fork 0
Code

add some Evoral enums to the enumwriter (seems a bit odd)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13044 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-07-16 14:45:35 +00:00
parent 9816ed02c7
commit 6e3168b7d3
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/ardour/enums.cc
View File

@ -20,6 +20,8 @@
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include "midi++/types.h" #include "midi++/types.h"
#include "evoral/Range.hpp" // shouldn't Evoral have its own enum registration?
#include "ardour/delivery.h" #include "ardour/delivery.h"
#include "ardour/diskstream.h" #include "ardour/diskstream.h"
#include "ardour/export_channel.h" #include "ardour/export_channel.h"
@ -122,6 +124,7 @@ setup_enum_writer ()
Session::PostTransportWork _Session_PostTransportWork; Session::PostTransportWork _Session_PostTransportWork;
Session::SlaveState _Session_SlaveState; Session::SlaveState _Session_SlaveState;
MTC_Status _MIDI_MTC_Status; MTC_Status _MIDI_MTC_Status;
Evoral::OverlapType _OverlapType;
#define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear() #define REGISTER(e) enum_writer.register_distinct (typeid(e).name(), i, s); i.clear(); s.clear()
#define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear() #define REGISTER_BITS(e) enum_writer.register_bits (typeid(e).name(), i, s); i.clear(); s.clear()
@ -578,6 +581,13 @@ setup_enum_writer ()
REGISTER_ENUM(AudioTime); REGISTER_ENUM(AudioTime);
REGISTER_ENUM(MusicTime); REGISTER_ENUM(MusicTime);
REGISTER(_PositionLockStyle); REGISTER(_PositionLockStyle);
REGISTER_ENUM (Evoral::OverlapNone);
REGISTER_ENUM (Evoral::OverlapInternal);
REGISTER_ENUM (Evoral::OverlapStart);
REGISTER_ENUM (Evoral::OverlapEnd);
REGISTER_ENUM (Evoral::OverlapExternal);
REGISTER(_OverlapType);
} }
} /* namespace ARDOUR */ } /* namespace ARDOUR */
@ -853,3 +863,17 @@ std::ostream& operator<<(std::ostream& o, const PositionLockStyle& var)
std::string s = enum_2_string (var); std::string s = enum_2_string (var);
return o << s; return o << s;
} }
std::istream& operator>>(std::istream& o, Evoral::OverlapType& var)
{
std::string s;
o >> s;
var = (Evoral::OverlapType) string_2_enum (s, var);
return o;
}
std::ostream& operator<<(std::ostream& o, const Evoral::OverlapType& var)
{
std::string s = enum_2_string (var);
return o << s;
}