summaryrefslogtreecommitdiffstats
path: root/src/audio
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2021-01-31 13:47:47 +0100
committerUwe Klotz <uklotz@mixxx.org>2021-01-31 14:39:09 +0100
commit0848065bcccd6d263aba91d9b0ca485d43dd76d8 (patch)
treebf333d9c8505c3bf54091bea1c4f663b32de4129 /src/audio
parent4dbe44c3d58e13d4dd968e14a2a1b222a4b240c4 (diff)
Remove unused sample layout property from SignalInfo
Diffstat (limited to 'src/audio')
-rw-r--r--src/audio/signalinfo.cpp2
-rw-r--r--src/audio/signalinfo.h11
2 files changed, 2 insertions, 11 deletions
diff --git a/src/audio/signalinfo.cpp b/src/audio/signalinfo.cpp
index a86f449033..70888e8bd4 100644
--- a/src/audio/signalinfo.cpp
+++ b/src/audio/signalinfo.cpp
@@ -8,7 +8,6 @@ bool operator==(
const SignalInfo& lhs,
const SignalInfo& rhs) {
return lhs.getChannelCount() == rhs.getChannelCount() &&
- lhs.getSampleLayout() == rhs.getSampleLayout() &&
lhs.getSampleRate() == rhs.getSampleRate();
}
@@ -16,7 +15,6 @@ QDebug
operator<<(QDebug dbg, const SignalInfo& arg) {
dbg << "SignalInfo{";
arg.dbgChannelCount(dbg);
- arg.dbgSampleLayout(dbg);
arg.dbgSampleRate(dbg);
dbg << '}';
return dbg;
diff --git a/src/audio/signalinfo.h b/src/audio/signalinfo.h
index 3f6354e088..5805f8ade0 100644
--- a/src/audio/signalinfo.h
+++ b/src/audio/signalinfo.h
@@ -14,21 +14,14 @@ class SignalInfo final {
// Properties
MIXXX_DECL_PROPERTY(ChannelCount, channelCount, ChannelCount)
MIXXX_DECL_PROPERTY(SampleRate, sampleRate, SampleRate)
- MIXXX_DECL_PROPERTY(OptionalSampleLayout, sampleLayout, SampleLayout)
public:
constexpr SignalInfo() = default;
- constexpr explicit SignalInfo(
- OptionalSampleLayout sampleLayout)
- : m_sampleLayout(sampleLayout) {
- }
SignalInfo(
ChannelCount channelCount,
- SampleRate sampleRate,
- OptionalSampleLayout sampleLayout = std::nullopt)
+ SampleRate sampleRate)
: m_channelCount(channelCount),
- m_sampleRate(sampleRate),
- m_sampleLayout(sampleLayout) {
+ m_sampleRate(sampleRate) {
}
SignalInfo(SignalInfo&&) = default;
SignalInfo(const SignalInfo&) = default;