diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-12 18:14:09 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-12 18:14:09 -0400 |
commit | cc543280d9869d4a7b800d547c53e38b13d02cea (patch) | |
tree | aa26b29a02fa43ff24e5c9c777cb5294bf67e8e9 /libs/evoral | |
parent | 10643779b6f039a7458bd0c970ef40ac80ea0568 (diff) |
We were 2 more debug "bits" away from overflow, so recast PBD::DEBUG mechanism away from a 64bit integer and toward std::bitset.
Clean up a few minor related PBD::DEBUG issues along the way
Diffstat (limited to 'libs/evoral')
-rw-r--r-- | libs/evoral/evoral/types.hpp | 8 | ||||
-rw-r--r-- | libs/evoral/src/debug.cpp | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libs/evoral/evoral/types.hpp b/libs/evoral/evoral/types.hpp index 1951fb8ba6..7d3f415142 100644 --- a/libs/evoral/evoral/types.hpp +++ b/libs/evoral/evoral/types.hpp @@ -27,6 +27,8 @@ #include <limits> #include <list> +#include "pbd/debug.h" + #include "evoral/Beats.hpp" #include "evoral/visibility.h" @@ -46,9 +48,9 @@ typedef uint32_t EventType; namespace PBD { namespace DEBUG { - LIBEVORAL_API extern uint64_t Sequence; - LIBEVORAL_API extern uint64_t Note; - LIBEVORAL_API extern uint64_t ControlList; + LIBEVORAL_API extern DebugBits Sequence; + LIBEVORAL_API extern DebugBits Note; + LIBEVORAL_API extern DebugBits ControlList; } } diff --git a/libs/evoral/src/debug.cpp b/libs/evoral/src/debug.cpp index 9e82b93d1b..785c33bf1b 100644 --- a/libs/evoral/src/debug.cpp +++ b/libs/evoral/src/debug.cpp @@ -1,6 +1,6 @@ #include "evoral/types.hpp" -uint64_t PBD::DEBUG::Sequence = PBD::new_debug_bit ("sequence"); -uint64_t PBD::DEBUG::Note = PBD::new_debug_bit ("note"); -uint64_t PBD::DEBUG::ControlList = PBD::new_debug_bit ("controllist"); +PBD::DebugBits PBD::DEBUG::Sequence = PBD::new_debug_bit ("sequence"); +PBD::DebugBits PBD::DEBUG::Note = PBD::new_debug_bit ("note"); +PBD::DebugBits PBD::DEBUG::ControlList = PBD::new_debug_bit ("controllist"); |