Include wavpack/wavpack.h for WavpackContext

mixxxdj · Dec 29, 2019 · ee626b1 · ee626b1
1 parent 8943126
commit ee626b1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/sources/soundsourcewv.cpp b/src/sources/soundsourcewv.cpp
@@ -21,11 +21,25 @@ static WavpackStreamReader s_streamReader = {
         SoundSourceWV::CanSeekCallback,
         SoundSourceWV::WriteBytesCallback};
 
+
+
 } // anonymous namespace
 
+
+// This wrapper class hides the changing WavpackContext definition in
+// wavpack/wavpack.h from the public interface.
+class WpContext {
+  public:
+    WpContext(WavpackContext* wpc = nullptr)
+        : m_context(wpc) {
+    }
+    operator WavpackContext*() const { return m_context; }
+ private:
+    WavpackContext* m_context;
+}
+
 SoundSourceWV::SoundSourceWV(const QUrl& url)
         : SoundSource(url, "wv"),
-          m_wpc(nullptr),
           m_sampleScaleFactor(CSAMPLE_ZERO),
           m_pWVFile(nullptr),
           m_pWVCFile(nullptr),

diff --git a/src/sources/soundsourcewv.h b/src/sources/soundsourcewv.h
@@ -6,10 +6,10 @@
 
 class QFile;
 
-typedef void WavpackContext;
-
 namespace mixxx {
 
+class WpContext;
+
 class SoundSourceWV : public SoundSource {
   public:
     static int32_t ReadBytesCallback(void* id, void* data, int bcount);
@@ -35,7 +35,7 @@ class SoundSourceWV : public SoundSource {
             OpenMode mode,
             const OpenParams& params) override;
 
-    WavpackContext* m_wpc;
+    WpContext* m_wpc;
     CSAMPLE m_sampleScaleFactor;
     QFile* m_pWVFile;
     QFile* m_pWVCFile;