Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include wavpack/wavpack.h for WavpackContext #2416

Merged
merged 2 commits into from
Dec 30, 2019
Merged

Include wavpack/wavpack.h for WavpackContext #2416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f640f2
don't use WavpackContext in the public soundsourcewv interface
daschuer Dec 30, 2019
70387c6
use static_cast<WavpackContext*>(m_wpc)
daschuer Dec 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/sources/soundsourcewv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ SoundSource::OpenResult SoundSourceWV::tryOpen(
return OpenResult::Failed;
}

setChannelCount(WavpackGetReducedChannels(m_wpc));
setSampleRate(WavpackGetSampleRate(m_wpc));
setChannelCount(WavpackGetReducedChannels(static_cast<WavpackContext*>(m_wpc)));
setSampleRate(WavpackGetSampleRate(static_cast<WavpackContext*>(m_wpc)));
initFrameIndexRangeOnce(
mixxx::IndexRange::forward(
0,
WavpackGetNumSamples(m_wpc)));
WavpackGetNumSamples(static_cast<WavpackContext*>(m_wpc))));

if (WavpackGetMode(m_wpc) & MODE_FLOAT) {
if (WavpackGetMode(static_cast<WavpackContext*>(m_wpc)) & MODE_FLOAT) {
m_sampleScaleFactor = CSAMPLE_PEAK;
} else {
const int bitsPerSample = WavpackGetBitsPerSample(m_wpc);
const int bitsPerSample = WavpackGetBitsPerSample(static_cast<WavpackContext*>(m_wpc));
if ((bitsPerSample >= 8) && (bitsPerSample <= 32)) {
// Range of signed sample values: [-2 ^ (bitsPerSample - 1), 2 ^ (bitsPerSample - 1) - 1]
const uint32_t absSamplePeak = 1u << (bitsPerSample - 1);
Expand All @@ -96,7 +96,7 @@ SoundSource::OpenResult SoundSourceWV::tryOpen(

void SoundSourceWV::close() {
if (m_wpc) {
WavpackCloseFile(m_wpc);
WavpackCloseFile(static_cast<WavpackContext*>(m_wpc));
m_wpc = nullptr;
}
if (m_pWVFile) {
Expand All @@ -116,13 +116,13 @@ ReadableSampleFrames SoundSourceWV::readSampleFramesClamped(
const SINT firstFrameIndex = writableSampleFrames.frameIndexRange().start();

if (m_curFrameIndex != firstFrameIndex) {
if (WavpackSeekSample(m_wpc, firstFrameIndex)) {
if (WavpackSeekSample(static_cast<WavpackContext*>(m_wpc), firstFrameIndex)) {
m_curFrameIndex = firstFrameIndex;
} else {
kLogger.warning()
<< "Could not seek to first frame index"
<< firstFrameIndex;
m_curFrameIndex = WavpackGetSampleIndex(m_wpc);
m_curFrameIndex = WavpackGetSampleIndex(static_cast<WavpackContext*>(m_wpc));
return ReadableSampleFrames(IndexRange::between(m_curFrameIndex, m_curFrameIndex));
}
}
Expand All @@ -133,12 +133,12 @@ ReadableSampleFrames SoundSourceWV::readSampleFramesClamped(
static_assert(sizeof(CSAMPLE) == sizeof(int32_t),
"CSAMPLE and int32_t must have the same size");
CSAMPLE* pOutputBuffer = writableSampleFrames.writableData();
SINT unpackCount = WavpackUnpackSamples(m_wpc,
SINT unpackCount = WavpackUnpackSamples(static_cast<WavpackContext*>(m_wpc),
reinterpret_cast<int32_t*>(pOutputBuffer),
numberOfFramesTotal);
DEBUG_ASSERT(unpackCount >= 0);
DEBUG_ASSERT(unpackCount <= numberOfFramesTotal);
if (!(WavpackGetMode(m_wpc) & MODE_FLOAT)) {
if (!(WavpackGetMode(static_cast<WavpackContext*>(m_wpc)) & MODE_FLOAT)) {
// signed integer -> float
const SINT sampleCount = frames2samples(unpackCount);
for (SINT i = 0; i < sampleCount; ++i) {
Expand Down
10 changes: 7 additions & 3 deletions src/sources/soundsourcewv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

class QFile;

typedef void WavpackContext;

namespace mixxx {

class SoundSourceWV : public SoundSource {
Expand Down Expand Up @@ -35,7 +33,13 @@ class SoundSourceWV : public SoundSource {
OpenMode mode,
const OpenParams& params) override;

WavpackContext* m_wpc;
// A WavpackContext* type
// we cannot use the type directly, because it has
// changing definitions with different wavpack.h versions.
// wavpack.h can't be included here, bacause it has concurrent definitions
// with other decoder's header.
void* m_wpc;

CSAMPLE m_sampleScaleFactor;
QFile* m_pWVFile;
QFile* m_pWVCFile;
Expand Down