116575 2005-11-17 19:26:49 +0000 ktrm.cpp compile failure against libtunepimp-0.4.0 2006-01-17 16:21:21 +0000 1 1 2 Applications juk general unspecified Fedora RPMs Linux RESOLVED FIXED NOR wishlist --- 1 rdieter wheeler 0 oldest_to_newest 390907 0 rdieter 2005-11-17 19:26:49 +0000 Version: (using KDE KDE 3.5.0) Installed from: Fedora RPMs Compiler: gcc version 4.0.1 20050727 (Red Hat 4.0.1-5) OS: Linux $cd kdemultimedia-3.5.0/juk; make ktrm.o if g++ -DHAVE_CONFIG_H -I. -I. -I.. -I/usr/include/kde -I/usr/lib/qt-3.3/include -I/usr/X11R6/include -I/usr/include/cdda -I/usr/include/taglib -I/usr/include/kde/arts -DQT_THREAD_SUPPORT -D_REENTRANT -DNDEBUG -DNO_DEBUG -O2 -O2 -m32 -march=i386 -mtune=pentium4 -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -fexceptions -MT ktrm.o -MD -MP -MF ".deps/ktrm.Tpo" -c -o ktrm.o ktrm.cpp; \ then mv -f ".deps/ktrm.Tpo" ".deps/ktrm.Po"; else rm -f ".deps/ktrm.Tpo"; exit 1; fi ktrm.cpp: In member function `int KTRMRequestHandler::startLookup(KTRMLookup*)': /usr/include/tunepimp/tp_c.h:639: error: too few arguments to function `int tp_AddFile(void*, const char*, int)' ktrm.cpp:69: error: at this point in file ktrm.cpp: In constructor `KTRMRequestHandler::KTRMRequestHandler()': ktrm.cpp:123: error: `tp_SetUseUTF8' undeclared (first use this function) ktrm.cpp:123: error: (Each undeclared identifier is reported only once for each function it appears in.) ktrm.cpp:124: error: invalid conversion from `void (*)(void*, void*, TPCallbackEnum, int)' to `void (*)(void*, void*, TPCallbackEnum, int, TPFileStatus)' ktrm.cpp:124: error: initializing argument 2 of `void tp_SetNotifyCallback(void*, void (*)(void*, void*, TPCallbackEnum, int, TPFileStatus), void*)' ktrm.cpp: In member function `virtual void KTRMLookup::collision()': ktrm.cpp:506: error: base operand of `->' has non-pointer type `artistresult_t' ktrm.cpp:507: error: base operand of `->' has non-pointer type `albumresult_t' ktrm.cpp:509: error: base operand of `->' has non-pointer type `albumresult_t' make: *** [ktrm.o] Error 1 390908 1 13514 rdieter 2005-11-17 19:29:10 +0000 Created attachment 13514 quick-n-dirty (untested) build fix 390910 2 rdieter 2005-11-17 19:30:28 +0000 Of course, the patch fixes the build against libtunepimp-0.4 but (probably) breaks building against libtunepimp-0.3. 390919 3 rdieter 2005-11-17 20:14:25 +0000 See also bug #94988 (similar problem w/amarok) 391131 4 wheeler 2005-11-18 15:35:02 +0000 I've just downloaded the latest library and will try to do some testing with it today and then get a version into JuK and amaroK that has #ifdef's for the 0.3 and 0.4 versions. Hopefully it'll make it into 3.5. 391155 5 rdieter 2005-11-18 16:35:40 +0000 Thanks Scott. 391159 6 rdieter 2005-11-18 16:44:40 +0000 FYI, with the amarok patch I provided (see bug #94988), it at least compiles, but lookups are very flaky: 1. Initial musicbrainz lookup, ie, the first lookup on any audio file, (always?) fails. 2. ~75% of subsequent lookups on the same fail hang. 3. ~25% of subsequent lookups succeed. ??? So, I'd venture to guess there's some code changes required. (-: 393018 7 13646 andy 2005-11-25 17:14:25 +0000 Created attachment 13646 another similar tunepimp patch I have found this problem also. But, I do not set to 1 the last parameter of tp_AddFile(). And more convenient to use status parameter of TRMNotifyCallback() instead of tr_GetStatus() method. 406891 8 mueller 2006-01-17 16:21:21 +0000 SVN commit 499319 by mueller: musicbrainz 0.4.x support BUG:116575 M +3 -1 configure.in.in M +26 -3 ktrm.cpp --- branches/KDE/3.5/kdemultimedia/juk/configure.in.in #499318:499319 @@ -35,7 +35,9 @@ fi if test "x$have_musicbrainz" = xyes; then - AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz]) + AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding, + AC_DEFINE(HAVE_MUSICBRAINZ, 4, [have MusicBrainz 0.4.x]), + AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])) else AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz]) fi --- branches/KDE/3.5/kdemultimedia/juk/ktrm.cpp #499318:499319 @@ -42,7 +42,11 @@ extern "C" { +#if HAVE_MUSICBRAINZ >= 4 + static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status); +#else static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId); +#endif } /** @@ -66,7 +70,11 @@ int id; if(!m_fileMap.contains(lookup->file())) { +#if HAVE_MUSICBRAINZ >= 4 + id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()), 0); +#else id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file())); +#endif m_fileMap.insert(lookup->file(), id); } else { @@ -120,7 +128,11 @@ tp_SetAutoSaveThreshold(m_pimp, -1); tp_SetMoveFiles(m_pimp, false); tp_SetRenameFiles(m_pimp, false); +#if HAVE_MUSICBRAINZ >= 4 + tp_SetFileNameEncoding(m_pimp, "UTF-8"); +#else tp_SetUseUTF8(m_pimp, true); +#endif tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0); // Re-read proxy config. @@ -286,14 +298,19 @@ /** * Callback fuction for TunePimp lookup events. */ - -static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId) +#if HAVE_MUSICBRAINZ >= 4 +static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId, TPFileStatus status) +#else +static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type, int fileId) +#endif { if(type != tpFileChanged) return; track_t track = tp_GetTrack(pimp, fileId); +#if HAVE_MUSICBRAINZ < 4 TPFileStatus status = tr_GetStatus(track); +#endif switch(status) { case eRecognized: @@ -503,10 +520,16 @@ KTRMResult result; result.d->title = QString::fromUtf8(tracks[i]->name); +#if HAVE_MUSICBRAINZ >= 4 + result.d->artist = QString::fromUtf8(tracks[i]->artist.name); + result.d->album = QString::fromUtf8(tracks[i]->album.name); + result.d->year = tracks[i]->album.releaseYear; +#else result.d->artist = QString::fromUtf8(tracks[i]->artist->name); result.d->album = QString::fromUtf8(tracks[i]->album->name); + result.d->year = tracks[i]->album->releaseYear; +#endif result.d->track = tracks[i]->trackNum; - result.d->year = tracks[i]->album->releaseYear; result.d->relevance = tracks[i]->relevance; d->results.append(result); 13514 2005-11-17 19:29:10 +0000 2005-11-17 19:29:10 +0000 quick-n-dirty (untested) build fix kdemultimedia-3.5.0-tunepimp-0.4.patch text/plain 2329 rdieter LS0tIGtkZW11bHRpbWVkaWEtMy41LjAvanVrL2t0cm0uY3BwLnRwCTIwMDUtMTAtMTAgMDk6NTc6 MTYuMDAwMDAwMDAwIC0wNTAwCisrKyBrZGVtdWx0aW1lZGlhLTMuNS4wL2p1ay9rdHJtLmNwcAky MDA1LTExLTE3IDEyOjE3OjE2LjAwMDAwMDAwMCAtMDYwMApAQCAtNDIsNyArNDIsNyBAQAogCiBl eHRlcm4gIkMiCiB7Ci0gICAgc3RhdGljIHZvaWQgVFJNTm90aWZ5Q2FsbGJhY2sodHVuZXBpbXBf dCBwaW1wLCB2b2lkICpkYXRhLCBUUENhbGxiYWNrRW51bSB0eXBlLCBpbnQgZmlsZUlkKTsKKyAg ICBzdGF0aWMgdm9pZCBUUk1Ob3RpZnlDYWxsYmFjayh0dW5lcGltcF90IHBpbXAsIHZvaWQgKmRh dGEsIFRQQ2FsbGJhY2tFbnVtIHR5cGUsIGludCBmaWxlSWQsIFRQRmlsZVN0YXR1cyBzdGF0dXMp OwogfQogCiAvKioKQEAgLTY2LDcgKzY2LDggQEAKICAgICAgICAgaW50IGlkOwogCiAgICAgICAg IGlmKCFtX2ZpbGVNYXAuY29udGFpbnMobG9va3VwLT5maWxlKCkpKSB7Ci0gICAgICAgICAgICBp ZCA9IHRwX0FkZEZpbGUobV9waW1wLCBRRmlsZTo6ZW5jb2RlTmFtZShsb29rdXAtPmZpbGUoKSkp OworICAgICAgICAgICAgLy8gTm90IHN1cmUgaWYgM3JkIGZpZWxkIHNob3VsZCBiZSAwIG9yIDEs IGd1ZXNzaW5nIDEgLS0gUmV4CisgICAgICAgICAgICBpZCA9IHRwX0FkZEZpbGUobV9waW1wLCBR RmlsZTo6ZW5jb2RlTmFtZShsb29rdXAtPmZpbGUoKSksMSk7CiAgICAgICAgICAgICBtX2ZpbGVN YXAuaW5zZXJ0KGxvb2t1cC0+ZmlsZSgpLCBpZCk7CiAgICAgICAgIH0KICAgICAgICAgZWxzZSB7 CkBAIC0xMjAsNyArMTIxLDYgQEAKICAgICAgICAgdHBfU2V0QXV0b1NhdmVUaHJlc2hvbGQobV9w aW1wLCAtMSk7CiAgICAgICAgIHRwX1NldE1vdmVGaWxlcyhtX3BpbXAsIGZhbHNlKTsKICAgICAg ICAgdHBfU2V0UmVuYW1lRmlsZXMobV9waW1wLCBmYWxzZSk7Ci0gICAgICAgIHRwX1NldFVzZVVU RjgobV9waW1wLCB0cnVlKTsKICAgICAgICAgdHBfU2V0Tm90aWZ5Q2FsbGJhY2sobV9waW1wLCBU Uk1Ob3RpZnlDYWxsYmFjaywgMCk7CiAKICAgICAgICAgLy8gUmUtcmVhZCBwcm94eSBjb25maWcu CkBAIC0yODcsMTMgKzI4NywxMyBAQAogICogQ2FsbGJhY2sgZnVjdGlvbiBmb3IgVHVuZVBpbXAg bG9va3VwIGV2ZW50cy4KICAqLwogCi1zdGF0aWMgdm9pZCBUUk1Ob3RpZnlDYWxsYmFjayh0dW5l cGltcF90IHBpbXAsIHZvaWQgKiwgVFBDYWxsYmFja0VudW0gdHlwZSwgaW50IGZpbGVJZCkKK3N0 YXRpYyB2b2lkIFRSTU5vdGlmeUNhbGxiYWNrKHR1bmVwaW1wX3QgcGltcCwgdm9pZCAqLCBUUENh bGxiYWNrRW51bSB0eXBlLCBpbnQgZmlsZUlkLCBUUEZpbGVTdGF0dXMgc3RhdHVzKQogewogICAg IGlmKHR5cGUgIT0gdHBGaWxlQ2hhbmdlZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAgdHJhY2tf dCB0cmFjayA9IHRwX0dldFRyYWNrKHBpbXAsIGZpbGVJZCk7Ci0gICAgVFBGaWxlU3RhdHVzIHN0 YXR1cyA9IHRyX0dldFN0YXR1cyh0cmFjayk7CisgICAgc3RhdHVzID0gdHJfR2V0U3RhdHVzKHRy YWNrKTsKIAogICAgIHN3aXRjaChzdGF0dXMpIHsKICAgICBjYXNlIGVSZWNvZ25pemVkOgpAQCAt NTAzLDEwICs1MDMsMTAgQEAKICAgICAgICAgICAgICAgICBLVFJNUmVzdWx0IHJlc3VsdDsKIAog ICAgICAgICAgICAgICAgIHJlc3VsdC5kLT50aXRsZSA9IFFTdHJpbmc6OmZyb21VdGY4KHRyYWNr c1tpXS0+bmFtZSk7Ci0gICAgICAgICAgICAgICAgcmVzdWx0LmQtPmFydGlzdCA9IFFTdHJpbmc6 OmZyb21VdGY4KHRyYWNrc1tpXS0+YXJ0aXN0LT5uYW1lKTsKLSAgICAgICAgICAgICAgICByZXN1 bHQuZC0+YWxidW0gPSBRU3RyaW5nOjpmcm9tVXRmOCh0cmFja3NbaV0tPmFsYnVtLT5uYW1lKTsK KyAgICAgICAgICAgICAgICByZXN1bHQuZC0+YXJ0aXN0ID0gUVN0cmluZzo6ZnJvbVV0ZjgodHJh Y2tzW2ldLT5hcnRpc3QubmFtZSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LmQtPmFsYnVtID0g UVN0cmluZzo6ZnJvbVV0ZjgodHJhY2tzW2ldLT5hbGJ1bS5uYW1lKTsKICAgICAgICAgICAgICAg ICByZXN1bHQuZC0+dHJhY2sgPSB0cmFja3NbaV0tPnRyYWNrTnVtOwotICAgICAgICAgICAgICAg IHJlc3VsdC5kLT55ZWFyID0gdHJhY2tzW2ldLT5hbGJ1bS0+cmVsZWFzZVllYXI7CisgICAgICAg ICAgICAgICAgcmVzdWx0LmQtPnllYXIgPSB0cmFja3NbaV0tPmFsYnVtLnJlbGVhc2VZZWFyOwog ICAgICAgICAgICAgICAgIHJlc3VsdC5kLT5yZWxldmFuY2UgPSB0cmFja3NbaV0tPnJlbGV2YW5j ZTsKIAogICAgICAgICAgICAgICAgIGQtPnJlc3VsdHMuYXBwZW5kKHJlc3VsdCk7Cg== 13646 2005-11-25 17:14:25 +0000 2005-11-25 17:14:25 +0000 another similar tunepimp patch kdemultimedia-3.5.0-tunepimp-fix.asp.patch text/plain 2567 andy LS0tIGtkZW11bHRpbWVkaWEtMy41LjAvanVrL2t0cm0uY3BwLnR1bmVwaW1wLWZpeAkyMDA1LTEw LTEwIDE3OjU3OjE2LjAwMDAwMDAwMCArMDMwMAorKysga2RlbXVsdGltZWRpYS0zLjUuMC9qdWsv a3RybS5jcHAJMjAwNS0xMS0yNSAxODo1NToyNi4wMDAwMDAwMDAgKzAyMDAKQEAgLTQyLDcgKzQy LDcgQEAgY2xhc3MgS1RSTUxvb2t1cDsKIAogZXh0ZXJuICJDIgogewotICAgIHN0YXRpYyB2b2lk IFRSTU5vdGlmeUNhbGxiYWNrKHR1bmVwaW1wX3QgcGltcCwgdm9pZCAqZGF0YSwgVFBDYWxsYmFj a0VudW0gdHlwZSwgaW50IGZpbGVJZCk7CisgICAgc3RhdGljIHZvaWQgVFJNTm90aWZ5Q2FsbGJh Y2sodHVuZXBpbXBfdCBwaW1wLCB2b2lkICpkYXRhLCBUUENhbGxiYWNrRW51bSB0eXBlLCBpbnQg ZmlsZUlkLCBUUEZpbGVTdGF0dXMgc3RhdHVzKTsKIH0KIAogLyoqCkBAIC02Niw3ICs2Niw3IEBA IHB1YmxpYzoKICAgICAgICAgaW50IGlkOwogCiAgICAgICAgIGlmKCFtX2ZpbGVNYXAuY29udGFp bnMobG9va3VwLT5maWxlKCkpKSB7Ci0gICAgICAgICAgICBpZCA9IHRwX0FkZEZpbGUobV9waW1w LCBRRmlsZTo6ZW5jb2RlTmFtZShsb29rdXAtPmZpbGUoKSkpOworICAgICAgICAgICAgaWQgPSB0 cF9BZGRGaWxlKG1fcGltcCwgUUZpbGU6OmVuY29kZU5hbWUobG9va3VwLT5maWxlKCkpLCAwKTsK ICAgICAgICAgICAgIG1fZmlsZU1hcC5pbnNlcnQobG9va3VwLT5maWxlKCksIGlkKTsKICAgICAg ICAgfQogICAgICAgICBlbHNlIHsKQEAgLTEyMCw3ICsxMjAsNyBAQCBwcm90ZWN0ZWQ6CiAgICAg ICAgIHRwX1NldEF1dG9TYXZlVGhyZXNob2xkKG1fcGltcCwgLTEpOwogICAgICAgICB0cF9TZXRN b3ZlRmlsZXMobV9waW1wLCBmYWxzZSk7CiAgICAgICAgIHRwX1NldFJlbmFtZUZpbGVzKG1fcGlt cCwgZmFsc2UpOwotICAgICAgICB0cF9TZXRVc2VVVEY4KG1fcGltcCwgdHJ1ZSk7CisgICAgICAg IC8vdHBfU2V0VXNlVVRGOChtX3BpbXAsIHRydWUpOwogICAgICAgICB0cF9TZXROb3RpZnlDYWxs YmFjayhtX3BpbXAsIFRSTU5vdGlmeUNhbGxiYWNrLCAwKTsKIAogICAgICAgICAvLyBSZS1yZWFk IHByb3h5IGNvbmZpZy4KQEAgLTI4NywxMyArMjg3LDEzIEBAIHByb3RlY3RlZDoKICAqIENhbGxi YWNrIGZ1Y3Rpb24gZm9yIFR1bmVQaW1wIGxvb2t1cCBldmVudHMuCiAgKi8KIAotc3RhdGljIHZv aWQgVFJNTm90aWZ5Q2FsbGJhY2sodHVuZXBpbXBfdCBwaW1wLCB2b2lkICosIFRQQ2FsbGJhY2tF bnVtIHR5cGUsIGludCBmaWxlSWQpCitzdGF0aWMgdm9pZCBUUk1Ob3RpZnlDYWxsYmFjayh0dW5l cGltcF90IHBpbXAsIHZvaWQgKiwgVFBDYWxsYmFja0VudW0gdHlwZSwgaW50IGZpbGVJZCwgVFBG aWxlU3RhdHVzIHN0YXR1cykKIHsKICAgICBpZih0eXBlICE9IHRwRmlsZUNoYW5nZWQpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHRyYWNrX3QgdHJhY2sgPSB0cF9HZXRUcmFjayhwaW1wLCBmaWxl SWQpOwotICAgIFRQRmlsZVN0YXR1cyBzdGF0dXMgPSB0cl9HZXRTdGF0dXModHJhY2spOworICAg IC8vdHJhY2tfdCB0cmFjayA9IHRwX0dldFRyYWNrKHBpbXAsIGZpbGVJZCk7CisgICAgLy9UUEZp bGVTdGF0dXMgc3RhdHVzID0gdHJfR2V0U3RhdHVzKHRyYWNrKTsKIAogICAgIHN3aXRjaChzdGF0 dXMpIHsKICAgICBjYXNlIGVSZWNvZ25pemVkOgpAQCAtNTAxLDEyICs1MDEsMTQgQEAgdm9pZCBL VFJNTG9va3VwOjpjb2xsaXNpb24oKQogCiAgICAgICAgICAgICBmb3IoaW50IGkgPSAwOyBpIDwg cmVzdWx0Q291bnQ7IGkrKykgewogICAgICAgICAgICAgICAgIEtUUk1SZXN1bHQgcmVzdWx0Owor CQkgYXJ0aXN0cmVzdWx0X3QgKmFydGlzdCA9ICZ0cmFja3NbaV0tPmFydGlzdDsKKwkJIGFsYnVt cmVzdWx0X3QgKmFsYnVtID0gJnRyYWNrc1tpXS0+YWxidW07CiAKICAgICAgICAgICAgICAgICBy ZXN1bHQuZC0+dGl0bGUgPSBRU3RyaW5nOjpmcm9tVXRmOCh0cmFja3NbaV0tPm5hbWUpOwotICAg ICAgICAgICAgICAgIHJlc3VsdC5kLT5hcnRpc3QgPSBRU3RyaW5nOjpmcm9tVXRmOCh0cmFja3Nb aV0tPmFydGlzdC0+bmFtZSk7Ci0gICAgICAgICAgICAgICAgcmVzdWx0LmQtPmFsYnVtID0gUVN0 cmluZzo6ZnJvbVV0ZjgodHJhY2tzW2ldLT5hbGJ1bS0+bmFtZSk7CisgICAgICAgICAgICAgICAg cmVzdWx0LmQtPmFydGlzdCA9IFFTdHJpbmc6OmZyb21VdGY4KGFydGlzdC0+bmFtZSk7CisgICAg ICAgICAgICAgICAgcmVzdWx0LmQtPmFsYnVtID0gUVN0cmluZzo6ZnJvbVV0ZjgoYWxidW0tPm5h bWUpOwogICAgICAgICAgICAgICAgIHJlc3VsdC5kLT50cmFjayA9IHRyYWNrc1tpXS0+dHJhY2tO dW07Ci0gICAgICAgICAgICAgICAgcmVzdWx0LmQtPnllYXIgPSB0cmFja3NbaV0tPmFsYnVtLT5y ZWxlYXNlWWVhcjsKKyAgICAgICAgICAgICAgICByZXN1bHQuZC0+eWVhciA9IGFsYnVtLT5yZWxl YXNlWWVhcjsKICAgICAgICAgICAgICAgICByZXN1bHQuZC0+cmVsZXZhbmNlID0gdHJhY2tzW2ld LT5yZWxldmFuY2U7CiAKICAgICAgICAgICAgICAgICBkLT5yZXN1bHRzLmFwcGVuZChyZXN1bHQp Owo=