[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Shane King <kde () dontletsstart ! com>
Date:       2006-05-01 2:54:57
Message-ID: 1146452097.658360.32559.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 536038 by shakes:

Support for libtunepimp 0.5


 M  +1 -0      ChangeLog  
 M  +5 -3      configure.in.in  
 M  +12 -0     src/ktrm.cpp  


--- trunk/extragear/multimedia/amarok/ChangeLog #536037:536038
@@ -13,6 +13,7 @@
       view.
 
   CHANGES:
+    * Can now compile against libtunepimp 0.5.
     * Podcasts are automatically configured to be checked for updates.
     * Show only 2 decimal places for scores in the statistics module.
     * Replace 'Move to Collection' in file browser context menu by 'Organize
--- trunk/extragear/multimedia/amarok/configure.in.in #536037:536038
@@ -633,9 +633,11 @@
 fi
 
 if test "$build_musicbrainz" = "yes"; then
-    AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
-      AC_DEFINE(HAVE_TUNEPIMP, 4, [have MusicBrainz 0.4.x]),
-      AC_DEFINE(HAVE_TUNEPIMP, 1, [have MusicBrainz]))
+    AC_CHECK_LIB(tunepimp, tp_SetPUIDCollisionThreshold,
+      AC_DEFINE(HAVE_TUNEPIMP, 5, [have MusicBrainz 0.5.x]),      
+        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 #536037:536038
@@ -126,7 +126,11 @@
     {
         m_pimp = tp_New("KTRM", "0.1");
         //tp_SetDebug(m_pimp, true);
+#if HAVE_TUNEPIMP >= 5
+        tp_SetPUIDCollisionThreshold(m_pimp, 100);
+#else
         tp_SetTRMCollisionThreshold(m_pimp, 100);
+#endif
         tp_SetAutoFileLookup(m_pimp,true);
         tp_SetAutoSaveThreshold(m_pimp, -1);
         tp_SetMoveFiles(m_pimp, false);
@@ -282,7 +286,11 @@
     case eUnrecognized:
         KTRMEventHandler::send(fileId, KTRMEvent::Unrecognized);
         break;
+#if HAVE_TUNEPIMP >= 5
+    case ePUIDCollision:
+#else
     case eTRMCollision:
+#endif
 #if HAVE_TUNEPIMP >= 4
     case eUserSelection:
 #endif
@@ -539,7 +547,11 @@
     trm[0] = 0;
     track_t track = tp_GetTrack(KTRMRequestHandler::instance()->tunePimp(), d->fileId);
     tr_Lock(track);
+#if HAVE_TUNEPIMP >= 5
+    tr_GetPUID(track, trm, 255);
+#else
     tr_GetTRM(track, trm, 255);
+#endif
     if ( !trm[0] ) {
         tr_SetStatus(track, ePending);
         tp_Wake(KTRMRequestHandler::instance()->tunePimp(), track);
[prev in list] [next in list] [prev in thread] [next in thread]