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

Jump to bottom

Added if-else preproccesor directives to declare fprint/encoded point… #1073

Merged
merged 3 commits into from Dec 13, 2016
Merged

Added if-else preproccesor directives to declare fprint/encoded point… #1073

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71f3e5d
Added typedefs/if-else preproccesor directives to declare fprint/enco…
alyptik Dec 13, 2016
830e864
Moved typedefs inside anonymous namespace and added CHROMAPRINT_VERSI…
alyptik Dec 13, 2016
c5b4368
Correct inconsistant indentations
alyptik Dec 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/musicbrainz/chromaprinter.cpp
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down