94988 2004-12-12 15:50:51 +0000 support libtunepimp-0.4.0 2006-06-11 12:32:01 +0000 1 1 2 Applications amarok general 1.3.6 Gentoo Packages Linux RESOLVED FIXED NOR wishlist --- 1 exhuma amarok-bugs-null anthrem hanno pluto rdieter 0 oldest_to_newest 293587 0 exhuma 2004-12-12 15:50:51 +0000 Version: 1.2-beta2 (using KDE KDE 3.3.1) Installed from: Gentoo Packages Compiler: gcc version 3.3.4 20040623 (Gentoo Linux 3.3.4-r1, ssp-3.3.2-2, pie-8.7.6) OS: Linux Hi, just wanted to compile the newest version (1.2-beta2), but I failed due to the following compiler error. I als included the compilation command, so I hope it gives you some insight. The same error is in the CVS version. I did the checkout on 14:40 on 12. Dec. 2004. Here goes: g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../amarok/src/amarokcore -I../../amarok/src/amarokcore -I../../amar ok/src/analyzers -I../../amarok/src/engine -I../../amarok/src/plugin -I/usr/kde/3.3/include/arts -I/usr/incl ude/taglib -I../../amarok/src/sqlite -I/usr/kde/3.3/include -I/usr/qt/3/include -I/usr/X11R6/include -DQT _THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -ansi -D_XOPEN_SOURCE=500 -D_BSD_SO URCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -DNDEBUG -DNO_DEBU G -O2 -march=athlon-xp -pipe -O2 -mcpu=i686 -fomit-frame-pointer -Wformat-security -Wmissing-format-attribut e -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COM PAT -DQT_NO_TRANSLATION -c -o osd.o `test -f 'osd.cpp' || echo './'`osd.cpp /usr/local/include/tunepimp/tp_c.h: In member function `int KTRMRequestHandler::startLookup(KTRMLookup*)': /usr/local/include/tunepimp/tp_c.h:633: error: too few arguments to function ` int tp_AddFile(void*, const char*, int)' ktrm.cpp:68: error: at this point in file ktrm.cpp: In constructor `KTRMRequestHandler::KTRMRequestHandler()': ktrm.cpp:123: error: invalid conversion from `void (*)(void*, void*, TPCallbackEnum, int)' to `void (*)(void*, void*, TPCallbackEnum, int, TPFileStatus)' ktrm.cpp: In member function `virtual void KTRMLookup::collision()': ktrm.cpp:518: error: base operand of `->' has non-pointer type `artistresult_t' ktrm.cpp:519: error: base operand of `->' has non-pointer type `albumresult_t' ktrm.cpp:521: error: base operand of `->' has non-pointer type `albumresult_t' 293590 1 kretschmann 2004-12-12 16:06:48 +0000 Did you use --enable-final? amaroK does not support that. 297057 2 kretschmann 2004-12-24 09:27:01 +0000 Invalid, because --enable-final is unsupported. 297124 3 thiago 2004-12-24 16:52:59 +0000 It should be. 339833 4 mpyne 2005-05-05 22:14:39 +0000 For those looking at this bug and getting a similar error, it's probably caused by using tunepimp CVS, which is not supported. Please use tunepimp 0.3.x 390809 5 w.bakker32 2005-11-17 12:55:44 +0000 I used the latest release tunepimp-0.4.0 , apparently that is not supported either than? 390917 6 rdieter 2005-11-17 20:07:34 +0000 Verified against libtunepimp-0.4.0. See also bug #116575 (kdemultimedia/juk) 390918 7 13516 rdieter 2005-11-17 20:10:36 +0000 Created attachment 13516 quick-n-dirty (untested) build fix 391127 8 rdieter 2005-11-18 14:58:38 +0000 *** Bug 116566 has been marked as a duplicate of this bug. *** 403554 9 aoliveira 2006-01-04 16:33:20 +0000 *** Bug 119505 has been marked as a duplicate of this bug. *** 403572 10 rdieter 2006-01-04 17:05:31 +0000 It appears the quick-n-dirty patch included here has at least one big problem: amarok hangs when trying to use "Fill in the tag with Musicbrainz" feature on unsupported filetypes (ie, on mp3's, but when using a libtunepimp built without mp3 support). 406927 11 mueller 2006-01-17 17:42:38 +0000 SVN commit 499350 by mueller: support musicbrainz 0.4.x BUG:94988 M +3 -1 configure.in.in M +26 -3 src/ktrm.cpp --- branches/stable/extragear/multimedia/amarok/configure.in.in #499349:499350 @@ -591,7 +591,9 @@ fi if test "$build_musicbrainz" = "yes"; then - AC_DEFINE(HAVE_TUNEPIMP, 1, [have TunePimp]) + AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding, + AC_DEFINE(HAVE_TUNEPIMP, 4, [have MusicBrainz 0.4.x]), + AC_DEFINE(HAVE_TUNEPIMP, 1, [have MusicBrainz])) LIB_TUNEPIMP="-ltunepimp" have_tunepimp=yes else --- branches/stable/extragear/multimedia/amarok/src/ktrm.cpp #499349:499350 @@ -42,7 +42,11 @@ extern "C" { +#if HAVE_TUNEPIMP >= 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_TUNEPIMP >= 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 { @@ -121,7 +129,11 @@ tp_SetAutoSaveThreshold(m_pimp, -1); tp_SetMoveFiles(m_pimp, false); tp_SetRenameFiles(m_pimp, false); +#if HAVE_TUNEPIMP >= 4 + tp_SetFileNameEncoding(m_pimp, "UTF-8"); +#else tp_SetUseUTF8(m_pimp, true); +#endif tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0); if(KProtocolManager::useProxy()) { @@ -244,14 +256,19 @@ /** * Callback fuction for TunePimp lookup events. */ - -static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId) +#if HAVE_TUNEPIMP >= 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_TUNEPIMP < 4 TPFileStatus status = tr_GetStatus(track); +#endif switch(status) { case eRecognized: @@ -556,10 +573,16 @@ KTRMResult result; result.d->title = QString::fromUtf8(tracks[i]->name); +#if HAVE_TUNEPIMP >= 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 = 4 * stringSimilarity(strList,result.d->title) + 2 * stringSimilarity(strList,result.d->artist) + 406928 12 mueller 2006-01-17 17:43:39 +0000 SVN commit 499352 by mueller: musicbrainz 0.4.x support CCBUG:94988 M +3 -1 configure.in.in M +26 -3 src/ktrm.cpp --- trunk/extragear/multimedia/amarok/configure.in.in #499351:499352 @@ -694,7 +694,9 @@ fi if test "$build_musicbrainz" = "yes"; then - AC_DEFINE(HAVE_TUNEPIMP, 1, [have TunePimp]) + AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding, + AC_DEFINE(HAVE_TUNEPIMP, 4, [have MusicBrainz 0.4.x]), + AC_DEFINE(HAVE_TUNEPIMP, 1, [have MusicBrainz])) LIB_TUNEPIMP="-ltunepimp" have_tunepimp=yes else --- trunk/extragear/multimedia/amarok/src/ktrm.cpp #499351:499352 @@ -42,7 +42,11 @@ extern "C" { +#if HAVE_TUNEPIMP >= 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_TUNEPIMP >= 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 { @@ -121,7 +129,11 @@ tp_SetAutoSaveThreshold(m_pimp, -1); tp_SetMoveFiles(m_pimp, false); tp_SetRenameFiles(m_pimp, false); +#if HAVE_TUNEPIMP >= 4 + tp_SetFileNameEncoding(m_pimp, "UTF-8"); +#else tp_SetUseUTF8(m_pimp, true); +#endif tp_SetNotifyCallback(m_pimp, TRMNotifyCallback, 0); if(KProtocolManager::useProxy()) { @@ -244,14 +256,19 @@ /** * Callback fuction for TunePimp lookup events. */ - -static void TRMNotifyCallback(tunepimp_t pimp, void *, TPCallbackEnum type, int fileId) +#if HAVE_TUNEPIMP >= 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_TUNEPIMP < 4 TPFileStatus status = tr_GetStatus(track); +#endif switch(status) { case eRecognized: @@ -556,10 +573,16 @@ KTRMResult result; result.d->title = QString::fromUtf8(tracks[i]->name); +#if HAVE_TUNEPIMP >= 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 = 4 * stringSimilarity(strList,result.d->title) + 2 * stringSimilarity(strList,result.d->artist) + 13516 2005-11-17 20:10:36 +0000 2005-11-17 20:10:36 +0000 quick-n-dirty (untested) build fix amarok-1.3.6-tunepimp-0.4.patch text/plain 2410 rdieter LS0tIGFtYXJvay0xLjMuNi9hbWFyb2svc3JjL2t0cm0uY3BwLnRwCTIwMDUtMTEtMDcgMTY6MTk6 MTguMDAwMDAwMDAwIC0wNjAwCisrKyBhbWFyb2stMS4zLjYvYW1hcm9rL3NyYy9rdHJtLmNwcAky MDA1LTExLTE3IDEzOjA5OjM1LjAwMDAwMDAwMCAtMDYwMApAQCAtNDIsNyArNDIsNyBAQAogCiBl eHRlcm4gIkMiCiB7Ci0gICAgc3RhdGljIHZvaWQgVFJNTm90aWZ5Q2FsbGJhY2sodHVuZXBpbXBf dCBwaW1wLCB2b2lkICpkYXRhLCBUUENhbGxiYWNrRW51bSB0eXBlLCBpbnQgZmlsZUlkKTsKKyAg ICBzdGF0aWMgdm9pZCBUUk1Ob3RpZnlDYWxsYmFjayh0dW5lcGltcF90IHBpbXAsIHZvaWQgKmRh dGEsIFRQQ2FsbGJhY2tFbnVtIHR5cGUsIGludCBmaWxlSWQsIFRQRmlsZVN0YXR1cyBzdGF0dXMp OwogfQogCiAvKioKQEAgLTY2LDcgKzY2LDggQEAKICAgICAgICAgaW50IGlkOwogCiAgICAgICAg IGlmKCFtX2ZpbGVNYXAuY29udGFpbnMobG9va3VwLT5maWxlKCkpKSB7Ci0gICAgICAgICAgICBp ZCA9IHRwX0FkZEZpbGUobV9waW1wLCBRRmlsZTo6ZW5jb2RlTmFtZShsb29rdXAtPmZpbGUoKSkp OworICAgICAgICAgICAgLy8gTm90IHN1cmUgaWYgM3JkIGZpZWxkIHNob3VsZCBiZSAwIG9yIDEs IGd1ZXNzaW5nIDEgLS0gUmV4CisgICAgICAgICAgICBpZCA9IHRwX0FkZEZpbGUobV9waW1wLCBR RmlsZTo6ZW5jb2RlTmFtZShsb29rdXAtPmZpbGUoKSksMSk7CiAgICAgICAgICAgICBtX2ZpbGVN YXAuaW5zZXJ0KGxvb2t1cC0+ZmlsZSgpLCBpZCk7CiAgICAgICAgIH0KICAgICAgICAgZWxzZSB7 CkBAIC0xMjEsNyArMTIyLDYgQEAKICAgICAgICAgdHBfU2V0QXV0b1NhdmVUaHJlc2hvbGQobV9w aW1wLCAtMSk7CiAgICAgICAgIHRwX1NldE1vdmVGaWxlcyhtX3BpbXAsIGZhbHNlKTsKICAgICAg ICAgdHBfU2V0UmVuYW1lRmlsZXMobV9waW1wLCBmYWxzZSk7Ci0gICAgICAgIHRwX1NldFVzZVVU RjgobV9waW1wLCB0cnVlKTsKICAgICAgICAgdHBfU2V0Tm90aWZ5Q2FsbGJhY2sobV9waW1wLCBU Uk1Ob3RpZnlDYWxsYmFjaywgMCk7CiAKICAgICAgICAgaWYoS1Byb3RvY29sTWFuYWdlcjo6dXNl UHJveHkoKSkgewpAQCAtMjQ1LDEzICsyNDUsMTMgQEAKICAqIENhbGxiYWNrIGZ1Y3Rpb24gZm9y IFR1bmVQaW1wIGxvb2t1cCBldmVudHMuCiAgKi8KIAotc3RhdGljIHZvaWQgVFJNTm90aWZ5Q2Fs bGJhY2sodHVuZXBpbXBfdCBwaW1wLCB2b2lkICosIFRQQ2FsbGJhY2tFbnVtIHR5cGUsIGludCBm aWxlSWQpCitzdGF0aWMgdm9pZCBUUk1Ob3RpZnlDYWxsYmFjayh0dW5lcGltcF90IHBpbXAsIHZv aWQgKiwgVFBDYWxsYmFja0VudW0gdHlwZSwgaW50IGZpbGVJZCwgVFBGaWxlU3RhdHVzIHN0YXR1 cykKIHsKICAgICBpZih0eXBlICE9IHRwRmlsZUNoYW5nZWQpCiAgICAgICAgIHJldHVybjsKIAog ICAgIHRyYWNrX3QgdHJhY2sgPSB0cF9HZXRUcmFjayhwaW1wLCBmaWxlSWQpOwotICAgIFRQRmls ZVN0YXR1cyBzdGF0dXMgPSB0cl9HZXRTdGF0dXModHJhY2spOworICAgIHN0YXR1cyA9IHRyX0dl dFN0YXR1cyh0cmFjayk7CiAKICAgICBzd2l0Y2goc3RhdHVzKSB7CiAgICAgY2FzZSBlUmVjb2du aXplZDoKQEAgLTU1NiwxMCArNTU2LDEwIEBACiAgICAgICAgICAgICAgICAgS1RSTVJlc3VsdCBy ZXN1bHQ7CiAKICAgICAgICAgICAgICAgICByZXN1bHQuZC0+dGl0bGUgPSBRU3RyaW5nOjpmcm9t VXRmOCh0cmFja3NbaV0tPm5hbWUpOwotICAgICAgICAgICAgICAgIHJlc3VsdC5kLT5hcnRpc3Qg PSBRU3RyaW5nOjpmcm9tVXRmOCh0cmFja3NbaV0tPmFydGlzdC0+bmFtZSk7Ci0gICAgICAgICAg ICAgICAgcmVzdWx0LmQtPmFsYnVtID0gUVN0cmluZzo6ZnJvbVV0ZjgodHJhY2tzW2ldLT5hbGJ1 bS0+bmFtZSk7CisgICAgICAgICAgICAgICAgcmVzdWx0LmQtPmFydGlzdCA9IFFTdHJpbmc6OmZy b21VdGY4KHRyYWNrc1tpXS0+YXJ0aXN0Lm5hbWUpOworICAgICAgICAgICAgICAgIHJlc3VsdC5k LT5hbGJ1bSA9IFFTdHJpbmc6OmZyb21VdGY4KHRyYWNrc1tpXS0+YWxidW0ubmFtZSk7CiAgICAg ICAgICAgICAgICAgcmVzdWx0LmQtPnRyYWNrID0gdHJhY2tzW2ldLT50cmFja051bTsKLSAgICAg ICAgICAgICAgICByZXN1bHQuZC0+eWVhciA9IHRyYWNrc1tpXS0+YWxidW0tPnJlbGVhc2VZZWFy OworICAgICAgICAgICAgICAgIHJlc3VsdC5kLT55ZWFyID0gdHJhY2tzW2ldLT5hbGJ1bS5yZWxl YXNlWWVhcjsKICAgICAgICAgICAgICAgICByZXN1bHQuZC0+cmVsZXZhbmNlID0KICAgICAgICAg ICAgICAgICAgICAgNCAqIHN0cmluZ1NpbWlsYXJpdHkoc3RyTGlzdCxyZXN1bHQuZC0+dGl0bGUp ICsKICAgICAgICAgICAgICAgICAgICAgMiAqIHN0cmluZ1NpbWlsYXJpdHkoc3RyTGlzdCxyZXN1 bHQuZC0+YXJ0aXN0KSArCg==