Commit eca0df2e authored by Richard Lärkäng's avatar Richard Lärkäng

Rename from musicbrainz to tunepimp in configure.in.in, defines etc

again so the names doesn't collide with the ones in libkcddb
where only libmusicbrainz and not tunepimp is needed

svn path=/trunk/KDE/kdemultimedia/juk/; revision=514819
parent 73f4f5b2
......@@ -79,7 +79,7 @@ INCLUDES= $(all_includes) $(taglib_includes) $(akode_includes) $(GST_CFLAGS) $(A
##################################################
# check to see if MusicBrainz is available
##################################################
if link_lib_MB
if link_lib_TP
tplibs = -ltunepimp
endif
##################################################
......
......@@ -20,30 +20,30 @@ fi
AC_SUBST(LIB_ARTS)
AC_SUBST(ARTS_CFLAGS)
AC_ARG_WITH(musicbrainz,
[AC_HELP_STRING(--with-musicbrainz,
[enable support for MusicBrainz @<:@default=check@:>@])],
[], with_musicbrainz=check)
AC_ARG_WITH(tunepimp,
[AC_HELP_STRING(--with-tunepimp,
[enable support for TunePimp @<:@default=check@:>@])],
[], with_tunepimp=check)
have_musicbrainz=no
have_tunepimp=no
if test "x$with_musicbrainz" != xno; then
KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes)
if test "x$with_tunepimp" != xno; then
KDE_CHECK_HEADER(tunepimp/tp_c.h, have_tunepimp=yes)
if test "x$with_musicbrainz" != xcheck && test "x$have_musicbrainz" != xyes; then
AC_MSG_ERROR([--with-musicbrainz was given, but test for MusicBrainz failed])
if test "x$with_tunepimp" != xcheck && test "x$have_tunepimp" != xyes; then
AC_MSG_ERROR([--with-tunepimp was given, but test for TunePimp failed])
fi
fi
if test "x$have_musicbrainz" = xyes; then
if test "x$have_tunepimp" = xyes; then
AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
AC_DEFINE(HAVE_MUSICBRAINZ, 4, [have MusicBrainz 0.4.x]),
AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz]))
AC_DEFINE(HAVE_TUNEPIMP, 4, [have TunePimp 0.4.x]),
AC_DEFINE(HAVE_TUNEPIMP, 1, [have TunePimp]))
else
AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
AC_DEFINE(HAVE_TUNEPIMP, 0, [have TunePimp])
fi
AM_CONDITIONAL(link_lib_MB, test "x$have_musicbrainz" = xyes)
AM_CONDITIONAL(link_lib_TP, test "x$have_tunepimp" = xyes)
AC_ARG_WITH(gstreamer,
[AC_HELP_STRING(--with-gstreamer,
......
......@@ -21,7 +21,7 @@
#include "ktrm.h"
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include <kapplication.h>
#include <kresolver.h>
......@@ -44,7 +44,7 @@ class KTRMLookup;
extern "C"
{
#if HAVE_MUSICBRAINZ >= 4
#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);
......@@ -72,7 +72,7 @@ public:
int id;
if(!m_fileMap.contains(lookup->file())) {
#if HAVE_MUSICBRAINZ >= 4
#if HAVE_TUNEPIMP >= 4
id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()), 0);
#else
id = tp_AddFile(m_pimp, QFile::encodeName(lookup->file()));
......@@ -131,7 +131,7 @@ protected:
tp_SetAutoSaveThreshold(m_pimp, -1);
tp_SetMoveFiles(m_pimp, false);
tp_SetRenameFiles(m_pimp, false);
#if HAVE_MUSICBRAINZ >= 4
#if HAVE_TUNEPIMP >= 4
tp_SetFileNameEncoding(m_pimp, "UTF-8");
#else
tp_SetUseUTF8(m_pimp, true);
......@@ -277,7 +277,7 @@ protected:
}
KTRMLookup *lookup = KTRMRequestHandler::instance()->lookup(e->fileId());
#if HAVE_MUSICBRAINZ >= 4
#if HAVE_TUNEPIMP >= 4
if ( e->status() != KTRMEvent::Unrecognized)
#endif
KTRMRequestHandler::instance()->removeFromLookupMap(e->fileId());
......@@ -304,7 +304,7 @@ protected:
/**
* Callback fuction for TunePimp lookup events.
*/
#if HAVE_MUSICBRAINZ >= 4
#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)
......@@ -313,7 +313,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type,
if(type != tpFileChanged)
return;
#if HAVE_MUSICBRAINZ < 4
#if HAVE_TUNEPIMP < 4
track_t track = tp_GetTrack(pimp, fileId);
TPFileStatus status = tr_GetStatus(track);
#endif
......@@ -326,7 +326,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type,
KTRMEventHandler::send(fileId, KTRMEvent::Unrecognized);
break;
case eTRMCollision:
#if HAVE_MUSICBRAINZ >= 4
#if HAVE_TUNEPIMP >= 4
case eUserSelection:
#endif
KTRMEventHandler::send(fileId, KTRMEvent::Collision);
......@@ -337,7 +337,7 @@ static void TRMNotifyCallback(tunepimp_t pimp, void *data, TPCallbackEnum type,
default:
break;
}
#if HAVE_MUSICBRAINZ < 4
#if HAVE_TUNEPIMP < 4
tp_ReleaseTrack(pimp, track);
#endif
}
......@@ -490,7 +490,7 @@ void KTRMLookup::recognized()
void KTRMLookup::unrecognized()
{
kDebug() << k_funcinfo << d->file << endl;
#if HAVE_MUSICBRAINZ >= 4
#if HAVE_TUNEPIMP >= 4
char trm[255];
bool finish = false;
trm[0] = 0;
......@@ -551,7 +551,7 @@ void KTRMLookup::collision()
KTRMResult result;
result.d->title = QString::fromUtf8(tracks[i]->name);
#if HAVE_MUSICBRAINZ >= 4
#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;
......
......@@ -29,7 +29,7 @@
#include <config.h>
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include <qstring.h>
#include <q3valuelist.h>
......
......@@ -15,7 +15,7 @@
#include "musicbrainzquery.h"
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include "trackpickerdialog.h"
#include "tag.h"
......
......@@ -18,7 +18,7 @@
#include <config.h>
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include "ktrm.h"
#include "filehandle.h"
......
......@@ -849,7 +849,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
// Guess tag info menu
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
menu = new KActionMenu(i18n("&Guess Tag Information"), QString::null, actions(), "guessTag");
/* menu->setIconSet(SmallIconSet("wizard")); */
......
......@@ -35,7 +35,7 @@ PlaylistItemList PlaylistItem::m_playingItems; // static
static void startMusicBrainzQuery(const FileHandle &file)
{
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
// This deletes itself when finished.
new MusicBrainzLookup(file);
#else
......
......@@ -15,7 +15,7 @@
#include <config.h>
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include <qlabel.h>
......@@ -98,6 +98,6 @@ int TrackPickerDialog::exec()
#include "trackpickerdialog.moc"
#endif // HAVE_MUSICBRAINZ
#endif // HAVE_TUNEPIMP
// vim: set et sw=4 tw=0 sta:
......@@ -18,7 +18,7 @@
#include <config.h>
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include <kdialogbase.h>
......@@ -46,7 +46,7 @@ private:
TrackPickerDialogBase *m_base;
};
#endif // HAVE_MUSICBRAINZ
#endif // HAVE_TUNEPIMP
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment