diff options
author | Uwe Klotz <uklotz@mixxx.org> | 2021-06-15 12:54:29 +0200 |
---|---|---|
committer | Uwe Klotz <uklotz@mixxx.org> | 2021-06-15 12:58:13 +0200 |
commit | 6ede09e054bfd6e5a87970559647d516fecdd1ac (patch) | |
tree | 7dbebcfdd726ebbddba9d4bab1a3a058c3adab08 /src/sources | |
parent | 7585ce91606b618ee575a78248a9bf4a4a649046 (diff) |
SoundSourceM4A: Fix armv7hl build on gcc 11.1
Diffstat (limited to 'src/sources')
-rw-r--r-- | src/sources/soundsourcem4a.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/sources/soundsourcem4a.cpp b/src/sources/soundsourcem4a.cpp index a1a1c2adbc..0578ef1f66 100644 --- a/src/sources/soundsourcem4a.cpp +++ b/src/sources/soundsourcem4a.cpp @@ -759,19 +759,19 @@ ReadableSampleFrames SoundSourceM4A::readSampleFramesClamped( pDecodeBuffer); // verify the in/out parameter // Verify the decoded sample data for consistency - VERIFY_OR_DEBUG_ASSERT(getSignalInfo().getChannelCount() == - decFrameInfo.channels) { + const auto channelCount = mixxx::audio::ChannelCount(decFrameInfo.channels); + VERIFY_OR_DEBUG_ASSERT(getSignalInfo().getChannelCount() == channelCount) { kLogger.critical() << "Corrupt or unsupported AAC file:" << "Unexpected number of channels" - << decFrameInfo.channels << "<>" + << channelCount << "<>" << getSignalInfo().getChannelCount(); break; // abort } - VERIFY_OR_DEBUG_ASSERT(getSignalInfo().getSampleRate() == - SINT(decFrameInfo.samplerate)) { + const auto sampleRate = mixxx::audio::SampleRate(decFrameInfo.samplerate); + VERIFY_OR_DEBUG_ASSERT(getSignalInfo().getSampleRate() == sampleRate) { kLogger.critical() << "Corrupt or unsupported AAC file:" - << "Unexpected sample rate" << decFrameInfo.samplerate + << "Unexpected sample rate" << sampleRate << "<>" << getSignalInfo().getSampleRate(); break; // abort } |