Description: chromaprint 1.4 compatibility
Origin: upstream,
 https://github.com/mixxxdj/mixxx/commit/71f3e5d0adb5116a23f9163b045f3419b9056a08,
 https://github.com/mixxxdj/mixxx/commit/830e864384ee1c96272997ee3f1dae4f71b28f3e,
 https://github.com/mixxxdj/mixxx/commit/c5b4368fd228feee28af4fb32ab6fbfd3f29f212
Last-Update: 2017-01-11

--- mixxx-2.0.0~dfsg.orig/src/musicbrainz/chromaprinter.cpp
+++ mixxx-2.0.0~dfsg/src/musicbrainz/chromaprinter.cpp
@@ -5,6 +5,19 @@
 #include "musicbrainz/chromaprinter.h"
 #include "soundsourceproxy.h"
 
+namespace
+{
+    // Type declarations of *fprint and *encoded pointers need to account for Chromaprint API version
+    // (void* -> uint32_t*) and (void* -> char*) changed in versions v1.4.0 or later -- alyptik 12/2016
+    #if (CHROMAPRINT_VERSION_MINOR > 3) || (CHROMAPRINT_VERSION_MAJOR > 1)
+        typedef uint32_t* uint32_p;
+        typedef char* char_p;
+    #else
+        typedef void* uint32_p;
+        typedef void* char_p;
+    #endif
+}
+
 ChromaPrinter::ChromaPrinter(QObject* parent)
              : QObject(parent) {
 }
@@ -57,12 +70,12 @@ QString ChromaPrinter::calcFingerPrint(c
     }
     chromaprint_finish(ctx);
 
-    void* fprint = NULL;
+    uint32_p fprint = NULL;
     int size = 0;
     int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
     QByteArray fingerprint;
     if (ret == 1) {
-        void* encoded = NULL;
+        char_p encoded = NULL;
         int encoded_size = 0;
         chromaprint_encode_fingerprint(fprint, size,
                                        CHROMAPRINT_ALGORITHM_DEFAULT,