Commit 9c47d3f5 authored by Richard Lärkäng's avatar Richard Lärkäng

Change from MusicBrainz to TunePimp in the configure and ifdefs

since that's what it's looking for, and I'm about to add a check
for just MusicBrainz in libkcddb

svn path=/trunk/KDE/kdemultimedia/juk/; revision=455853
parent d6ca681b
......@@ -79,12 +79,12 @@ INCLUDES= $(all_includes) $(taglib_includes) $(akode_includes) $(GST_CFLAGS) $(A
##################################################
# check to see if MusicBrainz is available
##################################################
if link_lib_MB
mblibs = -ltunepimp
if link_lib_TP
tplibs = -ltunepimp
endif
##################################################
juk_LDADD = -lm $(LDADD_GST) $(mblibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
juk_LDADD = -lm $(LDADD_GST) $(tplibs) $(LIB_KIO) $(taglib_libs) $(akode_libs) $(LIB_KHTML) $(LIB_ARTS)
juk_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDFLAGS_GST)
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
......
......@@ -19,7 +19,7 @@ if test "x$with_gstreamer" = xcheck && test "x$have_gst" = xno; then
echo "**************************************************"
fi
if test "x$with_musicbrainz" = xcheck && test "x$have_musicbrainz" = xno; then
if test "x$with_tunepimp" = xcheck && test "x$have_tunepimp" = xno; then
echo "**************************************************"
echo "*"
echo "* You do not seem to have libmusicbrainz and"
......
......@@ -20,27 +20,27 @@ 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
if test "x$with_musicbrainz" != xno; then
KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes)
have_tunepimp=no
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
AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
if test "x$have_tunepimp" = xyes; then
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 <kprotocolmanager.h>
......
......@@ -29,7 +29,7 @@
#include <config.h>
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include <qstring.h>
#include <qvaluelist.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"
......
......@@ -833,7 +833,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"));
......
......@@ -32,7 +32,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,4 +98,4 @@ int TrackPickerDialog::exec()
#include "trackpickerdialog.moc"
#endif // HAVE_MUSICBRAINZ
#endif // HAVE_TUNEPIMP
......@@ -18,7 +18,7 @@
#include <config.h>
#if HAVE_MUSICBRAINZ
#if HAVE_TUNEPIMP
#include <kdialogbase.h>
......@@ -46,6 +46,6 @@ 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