diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2021-02-01 10:44:07 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2021-02-01 10:44:07 +0100 |
commit | 3e48ffa89d54508173470714733e86a3b1512517 (patch) | |
tree | 18fa7fd682be7c5434d593914e0b86e889cc2210 /src/audio | |
parent | 44907feae1cf31b048107c060ea9e7e77c05b0cb (diff) |
Remove SampleLayout
Diffstat (limited to 'src/audio')
-rw-r--r-- | src/audio/types.cpp | 11 | ||||
-rw-r--r-- | src/audio/types.h | 20 |
2 files changed, 0 insertions, 31 deletions
diff --git a/src/audio/types.cpp b/src/audio/types.cpp index 3d01580fbd..f8f29ea7e2 100644 --- a/src/audio/types.cpp +++ b/src/audio/types.cpp @@ -17,17 +17,6 @@ QDebug operator<<(QDebug dbg, ChannelLayout arg) { return dbg; } -QDebug operator<<(QDebug dbg, SampleLayout arg) { - switch (arg) { - case SampleLayout::Planar: - return dbg << "Planar"; - case SampleLayout::Interleaved: - return dbg << "Interleaved"; - } - DEBUG_ASSERT(!"unreachable code"); - return dbg; -} - QDebug operator<<(QDebug dbg, SampleRate arg) { return dbg << static_cast<SampleRate::value_t>(arg) diff --git a/src/audio/types.h b/src/audio/types.h index aa6da46621..7bfb0cf83e 100644 --- a/src/audio/types.h +++ b/src/audio/types.h @@ -85,23 +85,6 @@ class ChannelCount { value_t m_value; }; -// Defines the ordering of how samples from multiple channels are -// stored in contiguous buffers: -// - Planar: Channel by channel -// - Interleaved: Frame by frame -// The samples from all channels that are coincident in time are -// called a "frame" (or more specific "sample frame"). -// -// Example: 10 stereo samples from left (L) and right (R) channel -// Planar layout: LLLLLLLLLLRRRRRRRRRR -// Interleaved layout: LRLRLRLRLRLRLRLRLRLR -enum class SampleLayout { - Planar, - Interleaved -}; - -QDebug operator<<(QDebug dbg, SampleLayout arg); - class SampleRate { public: typedef SINT value_t; @@ -206,9 +189,6 @@ Q_DECLARE_METATYPE(mixxx::audio::ChannelLayout) Q_DECLARE_TYPEINFO(mixxx::audio::OptionalChannelLayout, Q_MOVABLE_TYPE); Q_DECLARE_METATYPE(mixxx::audio::OptionalChannelLayout) -Q_DECLARE_TYPEINFO(mixxx::audio::SampleLayout, Q_PRIMITIVE_TYPE); -Q_DECLARE_METATYPE(mixxx::audio::SampleLayout) - Q_DECLARE_TYPEINFO(mixxx::audio::SampleRate, Q_PRIMITIVE_TYPE); Q_DECLARE_METATYPE(mixxx::audio::SampleRate) |