diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-17 15:03:53 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:43 -0400 |
| commit | 31a8f01d161bc0db330dbe2d4e41398d36808b00 (patch) | |
| tree | 7b11765944c8ccb685c01f7199d295ca62136f1f /libs/ardour/ardour/presentation_info.h | |
| parent | cefd3ac8beb73f819da8db1ab49a1ca136717a28 (diff) | |
fix thinko in use of sizeof() for bitshifting
Diffstat (limited to 'libs/ardour/ardour/presentation_info.h')
| -rw-r--r-- | libs/ardour/ardour/presentation_info.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h index f7446a7713..465371005b 100644 --- a/libs/ardour/ardour/presentation_info.h +++ b/libs/ardour/ardour/presentation_info.h @@ -179,7 +179,7 @@ class LIBARDOUR_API PresentationInfo these translate into the following - _order | _flags | order() + _order | _flags | global_order() -------------------------------------- 1 | 0x1 AudioTrack | ((0x1|0x2|0x4|0x8)<<32)|1 = 64424509441 2 | 0x2 AudioBus | ((0x1|0x2|0x4|0x8)<<32)|2 = 64424509442 @@ -193,9 +193,9 @@ class LIBARDOUR_API PresentationInfo */ - return (((global_order_t) (_flags | Route)) << sizeof(order_t)) | _order; + return (((global_order_t) (_flags | Route)) << (8*sizeof(order_t))) | _order; } else { - return (((global_order_t) _flags) << sizeof(order_t)) | _order; + return (((global_order_t) _flags) << (8*sizeof(order_t))) | _order; } } @@ -257,7 +257,7 @@ class LIBARDOUR_API PresentationInfo std::string to_string () const; uint64_t to_integer () const { - return ((uint64_t) _flags << sizeof(order_t)) | _order; + return ((uint64_t) _flags << (8*sizeof(order_t))) | _order; } bool operator< (PresentationInfo const& other) const { |