[patch] Proposed mixxx-2.0.0-chromaprintAPI-1.4.2.patch

mixxx-2.0.0-chromaprintAPI-1.4.2.patch (text/plain), 2.63 KB, created by Charlie Gehlin on 2017-01-03 16:54:51 UTC

@@ -12,6 +12,16 @@
 
 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
+
     // this is worth 2min of audio
     // AcoustID only stores a fingerprint for the first two minutes of a song
     // on their server so we need only a fingerprint of the first two minutes
@@ -67,12 +77,12 @@ namespace
             return QString();
         }
 
-        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,

diff -ur a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
--- a/src/musicbrainz/chromaprinter.cpp	2017-01-03 17:21:55.639254061 +0100
+++ b/src/musicbrainz/chromaprinter.cpp	2017-01-03 17:27:27.902582987 +0100
@@ -25,6 +25,16 @@
 
 QString ChromaPrinter::calcFingerPrint(const Mixxx::SoundSourcePointer& pSoundSource) {
 
+    // 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
+
     // this is worth 2min of audio, multiply by 2 because we have 2 channels
     // AcoustID only stores a fingerprint for the first two minutes of a song
     // on their server so we need only a fingerprint of the first two minutes
@@ -57,12 +67,12 @@
     }
     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,