Attachment #96127 for bug #138907

View | Details | Raw Unified | Return to bug 138907
Collapse All | Expand All




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  admin/Makefile
	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)


# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 2
KDE_DIST=configure.in.bot.end bcheck.pl cvs-clean.pl Makefile.in detect-autoconf.sh Doxyfile.global deps.am configure.in.min acinclude.m4.in debianrules libtool.m4.in nmcheck cvs.sh config.pl Doxyfile.am oldinclude.m4.in am_edit conf.change.pl Makefile.common 

#>+ 2
docs-am:

force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  admin/Makefile
	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in


#>+ 21





fi;
if test "$with_musicbrainz" != "no"; then
  if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then
  echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5
echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6
if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
fi
echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5
echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6
else
  # Is the header compilable?
echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h usability" >&5
echo $ECHO_N "checking tunepimp-0.5/tp_c.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
$ac_includes_default
#include <tunepimp-0.5/tp_c.h>
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_header_compiler=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_header_compiler=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6

# Is the header present?
echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h presence" >&5
echo $ECHO_N "checking tunepimp-0.5/tp_c.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h.  */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h.  */
#include <tunepimp-0.5/tp_c.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
  else
    ac_cpp_err=
  fi
else
  ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
  ac_header_preproc=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

  ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: proceeding with the compiler's result" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: present but cannot be compiled" >&2;}
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h:     check for missing prerequisite headers?" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h:     check for missing prerequisite headers?" >&2;}
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: see the Autoconf documentation" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: see the Autoconf documentation" >&2;}
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h:     section \"Present But Cannot Be Compiled\"" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h:     section \"Present But Cannot Be Compiled\"" >&2;}
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&2;}
    { echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&5
echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&2;}
    (
      cat <<\_ASBOX
## ------------------------------------------ ##
## Report this to the AC_PACKAGE_NAME lists.  ##
## ------------------------------------------ ##
_ASBOX
    ) |
      sed "s/^/$as_me: WARNING:     /" >&2
    ;;
esac
echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5
echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6
if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_cv_header_tunepimp_0_5_tp_c_h=$ac_header_preproc
fi
echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5
echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6

fi
if test $ac_cv_header_tunepimp_0_5_tp_c_h = yes; then
  build_musicbrainz="yes"
else
  if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
  echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5
echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6
if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then

  cat conftest.err >&5
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } &&
	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?

  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null; then
  if test -s conftest.err; then
    ac_cpp_err=$ac_c_preproc_warn_flag
    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
  else
    ac_cpp_err=
  fi

echo "${ECHO_T}$ac_header_preproc" >&6

# So?  What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
    { echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}

fi


fi
   ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu


fi
if test "$build_musicbrainz" = "yes"; then
  echo "$as_me:$LINENO: checking for tr_GetPUID in -ltunepimp" >&5
echo $ECHO_N "checking for tr_GetPUID in -ltunepimp... $ECHO_C" >&6
if test "${ac_cv_lib_tunepimp_tr_GetPUID+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
  ac_check_lib_save_LIBS=$LIBS

#endif
/* We use char because int might match the return type of a gcc2
   builtin and then its argument prototype would still apply.  */
char tr_GetPUID ();
int
main ()
{
tr_GetPUID ();
  ;
  return 0;
}

  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  ac_cv_lib_tunepimp_tr_GetPUID=yes
else
  echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5

ac_cv_lib_tunepimp_tr_GetPUID=no
fi
rm -f conftest.err conftest.$ac_objext \
      conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tr_GetPUID" >&5
echo "${ECHO_T}$ac_cv_lib_tunepimp_tr_GetPUID" >&6
if test $ac_cv_lib_tunepimp_tr_GetPUID = yes; then

cat >>confdefs.h <<\_ACEOF
#define HAVE_TUNEPIMP 5





   kde_safe_cppflags=$CPPFLAGS
   CPPFLAGS="$CPPFLAGS $all_includes"
    ac_ext=cc

Lines 133-142 Link Here

(-)kid3-0.7/configure.in (-2 / +4 lines)
133	with_musicbrainz=yes	133	with_musicbrainz=yes
134	)	134	)
135	if test "$with_musicbrainz" != "no"; then	135	if test "$with_musicbrainz" != "no"; then
136	KDE_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"], [build_musicbrainz="no"])	136	AC_CHECK_HEADER(tunepimp-0.5/tp_c.h, [build_musicbrainz="yes"],
		137	[AC_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"],
		138	[build_musicbrainz="no"])])
137	fi	139	fi
138	if test "$build_musicbrainz" = "yes"; then	140	if test "$build_musicbrainz" = "yes"; then
139	AC_CHECK_LIB(tunepimp, tp_SetPUIDCollisionThreshold,	141	AC_CHECK_LIB(tunepimp, tr_GetPUID,
140	AC_DEFINE(HAVE_TUNEPIMP, 5, [have TunePimp 0.5.x]),	142	AC_DEFINE(HAVE_TUNEPIMP, 5, [have TunePimp 0.5.x]),
141	AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,	143	AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
142	AC_DEFINE(HAVE_TUNEPIMP, 4, [have TunePimp 0.4.x]),	144	AC_DEFINE(HAVE_TUNEPIMP, 4, [have TunePimp 0.4.x]),

Lines 68-77 Link Here

(-)kid3-0.7/configure.in.in (-2 / +4 lines)
68	with_musicbrainz=yes	68	with_musicbrainz=yes
69	)	69	)
70	if test "$with_musicbrainz" != "no"; then	70	if test "$with_musicbrainz" != "no"; then
71	KDE_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"], [build_musicbrainz="no"])	71	AC_CHECK_HEADER(tunepimp-0.5/tp_c.h, [build_musicbrainz="yes"],
		72	[AC_CHECK_HEADER(tunepimp/tp_c.h, [build_musicbrainz="yes"],
		73	[build_musicbrainz="no"])])
72	fi	74	fi
73	if test "$build_musicbrainz" = "yes"; then	75	if test "$build_musicbrainz" = "yes"; then
74	AC_CHECK_LIB(tunepimp, tp_SetPUIDCollisionThreshold,	76	AC_CHECK_LIB(tunepimp, tr_GetPUID,
75	AC_DEFINE(HAVE_TUNEPIMP, 5, [have TunePimp 0.5.x]),	77	AC_DEFINE(HAVE_TUNEPIMP, 5, [have TunePimp 0.5.x]),
76	AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,	78	AC_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
77	AC_DEFINE(HAVE_TUNEPIMP, 4, [have TunePimp 0.4.x]),	79	AC_DEFINE(HAVE_TUNEPIMP, 4, [have TunePimp 0.4.x]),




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  doc/de/Makefile
	cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)


# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 2
KDE_DIST=Makefile.in 


force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  doc/de/Makefile
	cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in


#>+ 21




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  doc/en/Makefile
	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)


# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 2
KDE_DIST=Makefile.in 


force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  doc/en/Makefile
	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in


#>+ 21




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  doc/Makefile
	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)


# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 2
KDE_DIST=Makefile.in 


force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  doc/Makefile
	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in


#>+ 21




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  kid3/Makefile
	cd $(top_srcdir) && perl admin/am_edit kid3/Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)

# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 3
importdialog.moc.cpp: $(srcdir)/importdialog.h
	$(MOC) $(srcdir)/importdialog.h -o importdialog.moc.cpp

force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  kid3/Makefile
	cd $(top_srcdir) && perl admin/am_edit kid3/Makefile.in


#>+ 21




#define I18N_NOOP(s) QT_TR_NOOP(s)
#endif
#include <qfile.h>
#if HAVE_TUNEPIMP >= 5
#include <qsocket.h>
#include <qdom.h>
#endif
#include "musicbrainzconfig.h"
#include "freedbclient.h"
#include "importtrackdata.h"

#if HAVE_TUNEPIMP >= 5
/**
 * Constructor.
 *
 * @param numFiles   number of files to be queried
 * @param serverName server name
 * @param serverPort server port
 * @param proxyName  proxy name, empty if no proxy
 * @param proxyPort  proxy port
 */
LookupQuery::LookupQuery(int numFiles,
												 const QString& serverName, Q_UINT16 serverPort,
												 const QString& proxyName, Q_UINT16 proxyPort) :
	m_numFiles(numFiles), m_serverName(serverName), m_serverPort(serverPort),
	m_proxyName(proxyName), m_proxyPort(proxyPort),
	m_currentFile(-1), m_fileQueries(new FileQuery[numFiles]),
	m_sock(new QSocket)
{
	for (int i = 0; i < m_numFiles; ++i) {
		m_fileQueries[i].requested = false;
		m_fileQueries[i].puid = "";
	}
	connect(m_sock, SIGNAL(connected()),
			this, SLOT(socketConnected()));
	connect(m_sock, SIGNAL(error(int)),
			this, SLOT(socketError()));
	connect(m_sock, SIGNAL(connectionClosed()),
			this, SLOT(socketConnectionClosed()));
}

/**
 * Destructor.
 */
LookupQuery::~LookupQuery()
{
	m_sock->close();
	m_sock->disconnect();
	delete m_sock;
	delete [] m_fileQueries;
}

/**
 * Connect to server to query information about the current file.
 */
void LookupQuery::socketQuery()
{
	if (m_currentFile >= 0 && m_currentFile < m_numFiles) {
		QString  destName = m_proxyName.isEmpty() ? m_serverName : m_proxyName;
		Q_UINT16 destPort = m_proxyName.isEmpty() ? m_serverPort : m_proxyPort;
		m_request = "GET http://";
		m_request += m_serverName;
		if (m_serverPort != 80) {
			m_request += ':';
			m_request += QString::number(m_serverPort);
		}
		m_request += "/ws/1/track/?type=xml&puid=";
		m_request += m_fileQueries[m_currentFile].puid;
		m_request += " HTTP/1.0\r\nHost: ";
		m_request += m_serverName;
		m_request += "\r\nUser-agent: Kid3/" VERSION "\r\n\r\n";
		m_sock->connectToHost(destName, destPort);
		m_fileQueries[m_currentFile].requested = true;
	}
}

/**
 * Query the next file.
 */
void LookupQuery::queryNext()
{
	// handle the first pending query
	for (int i = 0; i < m_numFiles; ++i) {
		if (!m_fileQueries[i].requested &&
				!m_fileQueries[i].puid.isEmpty()) {
			m_currentFile = i;
			socketQuery();
			return;
		}
	}
	// no pending query => socketQuery() will be done in next query()
	m_currentFile = -1;
}

/**
 * Query a PUID from the server.
 *
 * @param puid  PUID
 * @param index index of file
 */
void LookupQuery::query(const char* puid, int index)
{
	m_fileQueries[index].puid = QString(puid);
	// if no request is being executed, start the current request
	if (m_currentFile < 0 || m_currentFile >= m_numFiles ||
			!m_fileQueries[m_currentFile].requested) {
		m_currentFile = index;
		socketQuery();
	}
}

/**
 * Send query when the socket is connected.
 */
void LookupQuery::socketConnected()
{
	m_sock->writeBlock(m_request.latin1(), m_request.length());
}

/**
 * Error on socket connection.
 */
void LookupQuery::socketError()
{
	queryNext();
}

/**
 * Read received data when the server has closed the connection.
 */
void LookupQuery::socketConnectionClosed()
{
	Q_ULONG len = m_sock->bytesAvailable();
	QCString buf;
	buf.resize(len + 1 );
	m_sock->readBlock(buf.data(), len);
	m_sock->close();

	int xmlStart = buf.find("<?xml");
	if (xmlStart >= 0 &&
			m_currentFile >= 0 && m_currentFile < m_numFiles &&
			m_fileQueries[m_currentFile].requested) {
		emit queryResponseReceived(m_currentFile, buf.mid(xmlStart, len - xmlStart));
	}
	queryNext();
}

#else

LookupQuery::LookupQuery(int, const QString&, Q_UINT16, const QString&, Q_UINT16) {}
LookupQuery::~LookupQuery() {}
void LookupQuery::socketConnected() {}
void LookupQuery::socketError() {}
void LookupQuery::socketConnectionClosed() {}

#endif


/**
 * Constructor.
 *

 */
MusicBrainzClient::MusicBrainzClient(ImportTrackDataVector& trackDataList) :
	m_trackDataVector(trackDataList), m_tp(0), m_ids(0), m_numFiles(0)
#if HAVE_TUNEPIMP >= 5
	, m_lookupQuery(0)
#endif
{
	m_tp = tp_New("kid3", VERSION);
#ifdef WIN32

#else
	tp_SetUseUTF8(m_tp, 1);
#endif
#if HAVE_TUNEPIMP >= 5
	tp_SetMusicDNSClientId(m_tp, "a95f5c7cd37fd4bce12dc86d196fb4fe");
#else
	tp_SetAutoFileLookup(m_tp, 1);
#endif
	tp_SetRenameFiles(m_tp, 0);
	tp_SetMoveFiles(m_tp, 0);
	tp_SetWriteID3v1(m_tp, 0);

    { eUnrecognized,  I18N_NOOP("Unrecognized") },
    { eRecognized,    I18N_NOOP("Recognized") },
    { ePending,       I18N_NOOP("Pending") },
#if HAVE_TUNEPIMP >= 5
    { ePUIDLookup,     I18N_NOOP("PUID Lookup") },
    { ePUIDCollision,  I18N_NOOP("PUID Collision") },
#else
    { eTRMLookup,     I18N_NOOP("TRM Lookup") },
    { eTRMCollision,  I18N_NOOP("TRM Collision") },
#endif
    { eFileLookup,    I18N_NOOP("File Lookup") },
    { eUserSelection, I18N_NOOP("User Selection") },
    { eVerified,      I18N_NOOP("Verified") },

					track_t track = tp_GetTrack(m_tp, id);
					if (track) {
						tr_Lock(track);
#if HAVE_TUNEPIMP >= 5
						tr_GetPUID(track, trm, sizeof(trm));
#else
						tr_GetTRM(track, trm, sizeof(trm));
#endif
						if (trm[0] == '\0') {
							tr_SetStatus(track, ePending);
							tp_Wake(m_tp, track);

						ImportTrackData trackData;
						getMetaData(id, trackData);
						emit metaDataReceived(index, trackData);
					}
#if HAVE_TUNEPIMP >= 5
					else if (statusCode == ePUIDLookup ||
									 statusCode == ePUIDCollision ||
									 statusCode == eFileLookup) {
						char puid[255];
						puid[0] = '\0';
						track_t track = tp_GetTrack(m_tp, id);
						if (track) {
							tr_Lock(track);
							tr_GetPUID(track, puid, sizeof(puid));
							tr_Unlock(track);
							tp_ReleaseTrack(m_tp, track);
						}
						if (m_lookupQuery) {
							m_lookupQuery->query(puid, index);
						}
					}
#else
					else if (statusCode == eTRMCollision ||
									 statusCode == eUserSelection) {
						ImportTrackDataVector trackDataList;
						if (getResults(id, trackDataList)) {
							emit resultsReceived(index, trackDataList);
						}
					}
#endif
				}
				break;
			}

	m_numFiles = m_trackDataVector.count();
#endif
	m_ids = new int[m_numFiles];
#if HAVE_TUNEPIMP >= 5
	char serverName[80], proxyName[80];
	short serverPort, proxyPort;
	tp_GetServer(m_tp, serverName, sizeof(serverName) - 1, &serverPort);
	tp_GetProxy(m_tp, proxyName, sizeof(proxyName) - 1, &proxyPort);
	m_lookupQuery = new LookupQuery(m_numFiles, serverName, serverPort,
																	proxyName, proxyPort);
	connect(m_lookupQuery, SIGNAL(queryResponseReceived(int, const QCString&)),
					this, SLOT(parseLookupResponse(int, const QCString&)));
#endif
	int i = 0;
	for (
#if QT_VERSION >= 300

		}
		delete [] m_ids;
		m_ids = 0;
#if HAVE_TUNEPIMP >= 5
		delete m_lookupQuery;
		m_lookupQuery = 0;
#endif
		m_numFiles = 0;
	}
}

	}
}

#if HAVE_TUNEPIMP >= 5

bool MusicBrainzClient::getResults(int, ImportTrackDataVector&) {
	return false;
}

/**
 * Process server response with lookup data.
 *
 * @param index    index of file
 * @param response response from server
 */
void MusicBrainzClient::parseLookupResponse(int index, const QCString& response)
{
	ImportTrackDataVector trackDataList;
	QDomDocument doc;
	if (doc.setContent(response)) {
		QDomElement trackList =
			doc.namedItem("metadata").toElement().namedItem("track-list").toElement();

		for (QDomNode trackNode = trackList.namedItem("track");
				 !trackNode.isNull();
				 trackNode = trackNode.nextSibling()) {
			QDomElement track = trackNode.toElement();

			ImportTrackData trackData;
			trackData.artist =
				track.namedItem("artist").toElement().namedItem("name").toElement().text();
			trackData.title = track.namedItem("title").toElement().text();

			for (QDomNode releaseNode =
						 track.namedItem("release-list").toElement().namedItem("release");
					 !releaseNode.isNull();
					 releaseNode = releaseNode.nextSibling() ) {
				QDomElement release = releaseNode.toElement();

				trackData.album = release.namedItem("title").toElement().text();
				trackData.track = -1;
				QDomNode releaseTrackNode = release.namedItem("track-list");
				if (!releaseTrackNode.isNull()) {
					QDomElement releaseTrack = releaseTrackNode.toElement();
					if (!releaseTrack.attribute("offset").isEmpty())
						trackData.track = releaseTrack.attribute("offset").toInt() + 1;
				}
			}
			trackDataList.append(trackData);
		}
	}

	if (trackDataList.size() > 1) {
		emit resultsReceived(index, trackDataList);
		emit statusChanged(index, i18n("User Selection"));
	} else if (trackDataList.size() == 1) {
		emit metaDataReceived(index, *trackDataList.begin());
		emit statusChanged(index, i18n("Recognized"));
	} else {
		emit statusChanged(index, i18n("Unrecognized"));
	}
}

#else

/**
 * Get results for an ambiguous file.
 *

	return resultsAvailable;
}

void MusicBrainzClient::parseLookupResponse(int, const QCString&) {}

#endif

#else // HAVE_TUNEPIMP

MusicBrainzClient::MusicBrainzClient(ImportTrackDataVector&) {}

Lines 15-21 Link Here

(-)kid3-0.7/kid3/musicbrainzclient.h (+115 lines)
15	#include <qobject.h>	15	#include <qobject.h>
16		16
17	#ifdef HAVE_TUNEPIMP	17	#ifdef HAVE_TUNEPIMP
		18	#if HAVE_TUNEPIMP >= 5
		19	#include <qbuffer.h>
		20	#include <tunepimp-0.5/tp_c.h>
		21	class QSocket;
		22	#else
18	#include <tunepimp/tp_c.h>	23	#include <tunepimp/tp_c.h>
		24	#endif
19	#endif // HAVE_TUNEPIMP	25	#endif // HAVE_TUNEPIMP
20		26
21	class MusicBrainzConfig;	27	class MusicBrainzConfig;
Lines 23-28 Link Here
23	class ImportTrackDataVector;	29	class ImportTrackDataVector;
24		30
25	/**	31	/**
		32	* A HTTP query to a musicbrainz server for HAVE_TUNEPIMP >= 5.
		33	*/
		34	class LookupQuery : public QObject {
		35	Q_OBJECT
		36
		37	public:
		38	/**
		39	* Constructor.
		40	*
		41	* @param numFiles number of files to be queried
		42	* @param serverName server name
		43	* @param serverPort server port
		44	* @param proxyName proxy name, empty if no proxy
		45	* @param proxyPort proxy port
		46	*/
		47	LookupQuery(int numFiles,
		48	const QString& serverName, Q_UINT16 serverPort = 80,
		49	const QString& proxyName = "", Q_UINT16 proxyPort = 80);
		50
		51	/**
		52	* Destructor.
		53	*/
		54	virtual ~LookupQuery();
		55
		56	#if HAVE_TUNEPIMP >= 5
		57	/**
		58	* Query a PUID from the server.
		59	*
		60	* @param puid PUID
		61	* @param index index of file
		62	*/
		63	void query(const char* puid, int index);
		64	#endif
		65
		66	signals:
		67	/**
		68	* Emitted when the query response is received
		69	*/
		70	void queryResponseReceived(int, const QCString&);
		71
		72	private slots:
		73	/**
		74	* Send query when the socket is connected.
		75	*/
		76	void socketConnected();
		77
		78	/**
		79	* Error on socket connection.
		80	*/
		81	void socketError();
		82
		83	/**
		84	* Read received data when the server has closed the connection.
		85	*/
		86	void socketConnectionClosed();
		87
		88	#if HAVE_TUNEPIMP >= 5
		89	private:
		90	/**
		91	* Connect to server to query information about the current file.
		92	*/
		93	void socketQuery();
		94
		95	/**
96	* Query the next file.
97	*/
98	void queryNext();
99
100	struct FileQuery {
101	bool requested;
102	QString puid;
103	};
104
105	/** Number of files to be queried. */
106	int m_numFiles;
107	/** MusicBrainz server */
108	QString m_serverName;
109	/** Port of MusicBrainz server */
110	Q_UINT16 m_serverPort;
111	/** Proxy */
112	QString m_proxyName;
113	/** Port of proxy */
114	Q_UINT16 m_proxyPort;
115	/**
116	* -1 if not yet started,
117	* 0..m_numFiles-1 if a file is currently processed,
118	* >=m_numFiles if all files processed.
119	*/
120	int m_currentFile;
121	FileQuery* m_fileQueries;
122	QSocket* m_sock;
123	QString m_request;
124	#endif
125	};
126
127
128	/**
26	* MusicBrainz client.	129	* MusicBrainz client.
27	*/	130	*/
28	class MusicBrainzClient : public QObject	131	class MusicBrainzClient : public QObject
Lines 85-90 Link Here
85	*/	188	*/
86	void resultsReceived(int, ImportTrackDataVector&);	189	void resultsReceived(int, ImportTrackDataVector&);
87		190
		191	private slots:
		192	/**
		193	* Process server response with lookup data.
		194	*
		195	* @param index index of file
		196	* @param response response from server
		197	*/
		198	void parseLookupResponse(int index, const QCString& response);
		199
88	#ifdef HAVE_TUNEPIMP	200	#ifdef HAVE_TUNEPIMP
89	private:	201	private:
90	/**	202	/**
Lines 126-131 Link Here
126	tunepimp_t m_tp;	238	tunepimp_t m_tp;
127	int* m_ids;	239	int* m_ids;
128	int m_numFiles;	240	int m_numFiles;
		241	#if HAVE_TUNEPIMP >= 5
		242	LookupQuery* m_lookupQuery;
		243	#endif
129	#endif // HAVE_TUNEPIMP	244	#endif // HAVE_TUNEPIMP
130	};	245	};
131		246




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  Makefile
	cd $(top_srcdir) && perl admin/am_edit Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)


# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 2
KDE_DIST=stamp-h.in subdirs Makefile.in kid3_de.html configure.files kid3_en.html kid3_ru.qm kid3_de.qm Makefile.cvs configure.in.in kid3_es.qm LICENSE 

#>+ 2
docs-am:

force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  Makefile
	cd $(top_srcdir) && perl admin/am_edit Makefile.in


#>+ 21




#>+ 3
	cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  po/Makefile
	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)


# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:


#>+ 2
KDE_DIST=ru.gmo de.po de.gmo es.po es.gmo kid3.pot ru.po Makefile.in 


force-reedit:
		cd $(top_srcdir) && \
	  $(AUTOMAKE) --gnu  po/Makefile
	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in


#>+ 21

Return to bug 138907

Lines 295-301 Link Here

(-)kid3-0.7/admin/Makefile.in (-4 / +3 lines)
295	#>+ 3	295	#>+ 3
296	cd $(top_srcdir) && \	296	cd $(top_srcdir) && \
297	$(AUTOMAKE) --gnu admin/Makefile	297	$(AUTOMAKE) --gnu admin/Makefile
298	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/admin/Makefile.in	298	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
299	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	299	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
300	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)	300	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
301		301
Lines 451-459 Link Here
451	# Otherwise a system limit (for SysV at least) may be exceeded.	451	# Otherwise a system limit (for SysV at least) may be exceeded.
452	.NOEXPORT:	452	.NOEXPORT:
453		453
454
455	#>+ 2	454	#>+ 2
456	KDE_DIST=configure.in.bot.end bcheck.pl detect-autoconf.sh deps.am configure.in.min debianrules cvs.sh config.pl oldinclude.m4.in am_edit Makefile.common cvs-clean.pl Makefile.in Doxyfile.global acinclude.m4.in libtool.m4.in nmcheck Doxyfile.am conf.change.pl	455	KDE_DIST=configure.in.bot.end bcheck.pl cvs-clean.pl Makefile.in detect-autoconf.sh Doxyfile.global deps.am configure.in.min acinclude.m4.in debianrules libtool.m4.in nmcheck cvs.sh config.pl Doxyfile.am oldinclude.m4.in am_edit conf.change.pl Makefile.common
457		456
458	#>+ 2	457	#>+ 2
459	docs-am:	458	docs-am:
Lines 462-468 Link Here
462	force-reedit:	461	force-reedit:
463	cd $(top_srcdir) && \	462	cd $(top_srcdir) && \
464	$(AUTOMAKE) --gnu admin/Makefile	463	$(AUTOMAKE) --gnu admin/Makefile
465	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/admin/Makefile.in	464	cd $(top_srcdir) && perl admin/am_edit admin/Makefile.in
466		465
467		466
468	#>+ 21	467	#>+ 21

Lines 296-302 Link Here

(-)kid3-0.7/doc/de/Makefile.in (-3 / +2 lines)
296	#>+ 3	296	#>+ 3
297	cd $(top_srcdir) && \	297	cd $(top_srcdir) && \
298	$(AUTOMAKE) --gnu doc/de/Makefile	298	$(AUTOMAKE) --gnu doc/de/Makefile
299	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/doc/de/Makefile.in	299	cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in
300	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	300	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
301	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)	301	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
302		302
Lines 446-452 Link Here
446	# Otherwise a system limit (for SysV at least) may be exceeded.	446	# Otherwise a system limit (for SysV at least) may be exceeded.
447	.NOEXPORT:	447	.NOEXPORT:
448		448
449
450	#>+ 2	449	#>+ 2
451	KDE_DIST=Makefile.in	450	KDE_DIST=Makefile.in
452		451
Lines 499-505 Link Here
499	force-reedit:	498	force-reedit:
500	cd $(top_srcdir) && \	499	cd $(top_srcdir) && \
501	$(AUTOMAKE) --gnu doc/de/Makefile	500	$(AUTOMAKE) --gnu doc/de/Makefile
502	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/doc/de/Makefile.in	501	cd $(top_srcdir) && perl admin/am_edit doc/de/Makefile.in
503		502
504		503
505	#>+ 21	504	#>+ 21

Lines 296-302 Link Here

(-)kid3-0.7/doc/en/Makefile.in (-3 / +2 lines)
296	#>+ 3	296	#>+ 3
297	cd $(top_srcdir) && \	297	cd $(top_srcdir) && \
298	$(AUTOMAKE) --gnu doc/en/Makefile	298	$(AUTOMAKE) --gnu doc/en/Makefile
299	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/doc/en/Makefile.in	299	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
300	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	300	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
301	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)	301	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
302		302
Lines 446-452 Link Here
446	# Otherwise a system limit (for SysV at least) may be exceeded.	446	# Otherwise a system limit (for SysV at least) may be exceeded.
447	.NOEXPORT:	447	.NOEXPORT:
448		448
449
450	#>+ 2	449	#>+ 2
451	KDE_DIST=Makefile.in	450	KDE_DIST=Makefile.in
452		451
Lines 499-505 Link Here
499	force-reedit:	498	force-reedit:
500	cd $(top_srcdir) && \	499	cd $(top_srcdir) && \
501	$(AUTOMAKE) --gnu doc/en/Makefile	500	$(AUTOMAKE) --gnu doc/en/Makefile
502	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/doc/en/Makefile.in	501	cd $(top_srcdir) && perl admin/am_edit doc/en/Makefile.in
503		502
504		503
505	#>+ 21	504	#>+ 21

Lines 307-313 Link Here

(-)kid3-0.7/doc/Makefile.in (-3 / +2 lines)
307	#>+ 3	307	#>+ 3
308	cd $(top_srcdir) && \	308	cd $(top_srcdir) && \
309	$(AUTOMAKE) --gnu doc/Makefile	309	$(AUTOMAKE) --gnu doc/Makefile
310	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/doc/Makefile.in	310	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
311	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	311	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
312	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)	312	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
313		313
Lines 593-599 Link Here
593	# Otherwise a system limit (for SysV at least) may be exceeded.	593	# Otherwise a system limit (for SysV at least) may be exceeded.
594	.NOEXPORT:	594	.NOEXPORT:
595		595
596
597	#>+ 2	596	#>+ 2
598	KDE_DIST=Makefile.in	597	KDE_DIST=Makefile.in
599		598
Lines 604-610 Link Here
604	force-reedit:	603	force-reedit:
605	cd $(top_srcdir) && \	604	cd $(top_srcdir) && \
606	$(AUTOMAKE) --gnu doc/Makefile	605	$(AUTOMAKE) --gnu doc/Makefile
607	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/doc/Makefile.in	606	cd $(top_srcdir) && perl admin/am_edit doc/Makefile.in
608		607
609		608
610	#>+ 21	609	#>+ 21

Lines 491-497 Link Here

(-)kid3-0.7/kid3/Makefile.in (-3 / +2 lines)
491	#>+ 3	491	#>+ 3
492	cd $(top_srcdir) && \	492	cd $(top_srcdir) && \
493	$(AUTOMAKE) --gnu kid3/Makefile	493	$(AUTOMAKE) --gnu kid3/Makefile
494	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/kid3/Makefile.in	494	cd $(top_srcdir) && perl admin/am_edit kid3/Makefile.in
495	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	495	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
496	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)	496	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
497	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)	497	binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
Lines 910-916 Link Here
910	# Otherwise a system limit (for SysV at least) may be exceeded.	910	# Otherwise a system limit (for SysV at least) may be exceeded.
911	.NOEXPORT:	911	.NOEXPORT:
912		912
913
914	#>+ 3	913	#>+ 3
915	importdialog.moc.cpp: $(srcdir)/importdialog.h	914	importdialog.moc.cpp: $(srcdir)/importdialog.h
916	$(MOC) $(srcdir)/importdialog.h -o importdialog.moc.cpp	915	$(MOC) $(srcdir)/importdialog.h -o importdialog.moc.cpp
Lines 1023-1029 Link Here
1023	force-reedit:	1022	force-reedit:
1024	cd $(top_srcdir) && \	1023	cd $(top_srcdir) && \
1025	$(AUTOMAKE) --gnu kid3/Makefile	1024	$(AUTOMAKE) --gnu kid3/Makefile
1026	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/kid3/Makefile.in	1025	cd $(top_srcdir) && perl admin/am_edit kid3/Makefile.in
1027		1026
1028		1027
1029	#>+ 21	1028	#>+ 21

Lines 31630-31651 Link Here

(-)kid3-0.7/configure (-31 / +151 lines)
31630		31630
31631	fi;	31631	fi;
31632	if test "$with_musicbrainz" != "no"; then	31632	if test "$with_musicbrainz" != "no"; then
		31633	if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then
		31634	echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5
		31635	echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6
		31636	if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then
		31637	echo $ECHO_N "(cached) $ECHO_C" >&6
		31638	fi
		31639	echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5
		31640	echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6
		31641	else
		31642	# Is the header compilable?
		31643	echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h usability" >&5
		31644	echo $ECHO_N "checking tunepimp-0.5/tp_c.h usability... $ECHO_C" >&6
		31645	cat >conftest.$ac_ext <<_ACEOF
		31646	/* confdefs.h. */
		31647	_ACEOF
		31648	cat confdefs.h >>conftest.$ac_ext
		31649	cat >>conftest.$ac_ext <<_ACEOF
		31650	/* end confdefs.h. */
		31651	$ac_includes_default
		31652	#include <tunepimp-0.5/tp_c.h>
		31653	_ACEOF
		31654	rm -f conftest.$ac_objext
		31655	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
		31656	(eval $ac_compile) 2>conftest.er1
		31657	ac_status=$?
		31658	grep -v '^ *+' conftest.er1 >conftest.err
		31659	rm -f conftest.er1
		31660	cat conftest.err >&5
		31661	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		31662	(exit $ac_status); } &&
		31663	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'
		31664	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		31665	(eval $ac_try) 2>&5
		31666	ac_status=$?
		31667	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		31668	(exit $ac_status); }; } &&
		31669	{ ac_try='test -s conftest.$ac_objext'
		31670	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
		31671	(eval $ac_try) 2>&5
		31672	ac_status=$?
		31673	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		31674	(exit $ac_status); }; }; then
		31675	ac_header_compiler=yes
		31676	else
		31677	echo "$as_me: failed program was:" >&5
		31678	sed 's/^/\| /' conftest.$ac_ext >&5
31633		31679
		31680	ac_header_compiler=no
		31681	fi
		31682	rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
		31683	echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
		31684	echo "${ECHO_T}$ac_header_compiler" >&6
31634		31685
		31686	# Is the header present?
		31687	echo "$as_me:$LINENO: checking tunepimp-0.5/tp_c.h presence" >&5
		31688	echo $ECHO_N "checking tunepimp-0.5/tp_c.h presence... $ECHO_C" >&6
		31689	cat >conftest.$ac_ext <<_ACEOF
		31690	/* confdefs.h. */
		31691	_ACEOF
		31692	cat confdefs.h >>conftest.$ac_ext
		31693	cat >>conftest.$ac_ext <<_ACEOF
		31694	/* end confdefs.h. */
		31695	#include <tunepimp-0.5/tp_c.h>
		31696	_ACEOF
		31697	if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
		31698	(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
		31699	ac_status=$?
		31700	grep -v '^ *+' conftest.er1 >conftest.err
		31701	rm -f conftest.er1
		31702	cat conftest.err >&5
		31703	echo "$as_me:$LINENO: \$? = $ac_status" >&5
		31704	(exit $ac_status); } >/dev/null; then
		31705	if test -s conftest.err; then
		31706	ac_cpp_err=$ac_c_preproc_warn_flag
		31707	ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
		31708	else
		31709	ac_cpp_err=
		31710	fi
		31711	else
		31712	ac_cpp_err=yes
		31713	fi
		31714	if test -z "$ac_cpp_err"; then
		31715	ac_header_preproc=yes
		31716	else
		31717	echo "$as_me: failed program was:" >&5
		31718	sed 's/^/\| /' conftest.$ac_ext >&5
31635		31719
		31720	ac_header_preproc=no
		31721	fi
		31722	rm -f conftest.err conftest.$ac_ext
		31723	echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
		31724	echo "${ECHO_T}$ac_header_preproc" >&6
31636		31725
31637	kde_safe_cppflags=$CPPFLAGS	31726	# So? What about this header?
31638	CPPFLAGS="$CPPFLAGS $all_includes"	31727	case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
31639	ac_ext=cc	31728	yes:no: )
31640	ac_cpp='$CXXCPP $CPPFLAGS'	31729	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5
31641	ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'	31730	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
31642	ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'	31731	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: proceeding with the compiler's result" >&5
31643	ac_compiler_gnu=$ac_cv_cxx_compiler_gnu	31732	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the compiler's result" >&2;}
31644		31733	ac_header_preproc=yes
31645	ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'	31734	;;
31646		31735	no:yes:* )
		31736	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: present but cannot be compiled" >&5
		31737	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: present but cannot be compiled" >&2;}
		31738	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: check for missing prerequisite headers?" >&5
		31739	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: check for missing prerequisite headers?" >&2;}
		31740	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: see the Autoconf documentation" >&5
		31741	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: see the Autoconf documentation" >&2;}
		31742	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: section \"Present But Cannot Be Compiled\"" >&5
		31743	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: section \"Present But Cannot Be Compiled\"" >&2;}
		31744	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&5
		31745	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: proceeding with the preprocessor's result" >&2;}
		31746	{ echo "$as_me:$LINENO: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&5
		31747	echo "$as_me: WARNING: tunepimp-0.5/tp_c.h: in the future, the compiler will take precedence" >&2;}
		31748	(
		31749	cat <<\_ASBOX
		31750	## ------------------------------------------ ##
		31751	## Report this to the AC_PACKAGE_NAME lists. ##
		31752	## ------------------------------------------ ##
		31753	_ASBOX
		31754	) \|
		31755	sed "s/^/$as_me: WARNING: /" >&2
		31756	;;
		31757	esac
		31758	echo "$as_me:$LINENO: checking for tunepimp-0.5/tp_c.h" >&5
		31759	echo $ECHO_N "checking for tunepimp-0.5/tp_c.h... $ECHO_C" >&6
		31760	if test "${ac_cv_header_tunepimp_0_5_tp_c_h+set}" = set; then
		31761	echo $ECHO_N "(cached) $ECHO_C" >&6
		31762	else
		31763	ac_cv_header_tunepimp_0_5_tp_c_h=$ac_header_preproc
		31764	fi
		31765	echo "$as_me:$LINENO: result: $ac_cv_header_tunepimp_0_5_tp_c_h" >&5
		31766	echo "${ECHO_T}$ac_cv_header_tunepimp_0_5_tp_c_h" >&6
31647		31767
31648	if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then	31768	fi
		31769	if test $ac_cv_header_tunepimp_0_5_tp_c_h = yes; then
		31770	build_musicbrainz="yes"
		31771	else
		31772	if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
31649	echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5	31773	echo "$as_me:$LINENO: checking for tunepimp/tp_c.h" >&5
31650	echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6	31774	echo $ECHO_N "checking for tunepimp/tp_c.h... $ECHO_C" >&6
31651	if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then	31775	if test "${ac_cv_header_tunepimp_tp_c_h+set}" = set; then
Lines 31675-31681 Link Here
31675	cat conftest.err >&5	31799	cat conftest.err >&5
31676	echo "$as_me:$LINENO: \$? = $ac_status" >&5	31800	echo "$as_me:$LINENO: \$? = $ac_status" >&5
31677	(exit $ac_status); } &&	31801	(exit $ac_status); } &&
31678	{ ac_try='test -z "$ac_cxx_werror_flag" \|\| test ! -s conftest.err'	31802	{ ac_try='test -z "$ac_c_werror_flag" \|\| test ! -s conftest.err'
31679	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5	31803	{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
31680	(eval $ac_try) 2>&5	31804	(eval $ac_try) 2>&5
31681	ac_status=$?	31805	ac_status=$?
Lines 31718-31725 Link Here
31718	echo "$as_me:$LINENO: \$? = $ac_status" >&5	31842	echo "$as_me:$LINENO: \$? = $ac_status" >&5
31719	(exit $ac_status); } >/dev/null; then	31843	(exit $ac_status); } >/dev/null; then
31720	if test -s conftest.err; then	31844	if test -s conftest.err; then
31721	ac_cpp_err=$ac_cxx_preproc_warn_flag	31845	ac_cpp_err=$ac_c_preproc_warn_flag
31722	ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag	31846	ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
31723	else	31847	else
31724	ac_cpp_err=	31848	ac_cpp_err=
31725	fi	31849	fi
Lines 31739-31745 Link Here
31739	echo "${ECHO_T}$ac_header_preproc" >&6	31863	echo "${ECHO_T}$ac_header_preproc" >&6
31740		31864
31741	# So? What about this header?	31865	# So? What about this header?
31742	case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in	31866	case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
31743	yes:no: )	31867	yes:no: )
31744	{ echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5	31868	{ echo "$as_me:$LINENO: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&5
31745	echo "$as_me: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}	31869	echo "$as_me: WARNING: tunepimp/tp_c.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
Lines 31788-31806 Link Here
31788	fi	31912	fi
31789		31913
31790		31914
31791	CPPFLAGS=$kde_safe_cppflags	31915	fi
31792	ac_ext=c
31793	ac_cpp='$CPP $CPPFLAGS'
31794	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
31795	ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
31796	ac_compiler_gnu=$ac_cv_c_compiler_gnu
31797		31916
31798		31917
31799	fi	31918	fi
31800	if test "$build_musicbrainz" = "yes"; then	31919	if test "$build_musicbrainz" = "yes"; then
31801	echo "$as_me:$LINENO: checking for tp_SetPUIDCollisionThreshold in -ltunepimp" >&5	31920	echo "$as_me:$LINENO: checking for tr_GetPUID in -ltunepimp" >&5
31802	echo $ECHO_N "checking for tp_SetPUIDCollisionThreshold in -ltunepimp... $ECHO_C" >&6	31921	echo $ECHO_N "checking for tr_GetPUID in -ltunepimp... $ECHO_C" >&6
31803	if test "${ac_cv_lib_tunepimp_tp_SetPUIDCollisionThreshold+set}" = set; then	31922	if test "${ac_cv_lib_tunepimp_tr_GetPUID+set}" = set; then
31804	echo $ECHO_N "(cached) $ECHO_C" >&6	31923	echo $ECHO_N "(cached) $ECHO_C" >&6
31805	else	31924	else
31806	ac_check_lib_save_LIBS=$LIBS	31925	ac_check_lib_save_LIBS=$LIBS
Lines 31818-31828 Link Here
31818	#endif	31937	#endif
31819	/* We use char because int might match the return type of a gcc2	31938	/* We use char because int might match the return type of a gcc2
31820	builtin and then its argument prototype would still apply. */	31939	builtin and then its argument prototype would still apply. */
31821	char tp_SetPUIDCollisionThreshold ();	31940	char tr_GetPUID ();
31822	int	31941	int
31823	main ()	31942	main ()
31824	{	31943	{
31825	tp_SetPUIDCollisionThreshold ();	31944	tr_GetPUID ();
31826	;	31945	;
31827	return 0;	31946	return 0;
31828	}	31947	}
Lines 31848-31867 Link Here
31848	ac_status=$?	31967	ac_status=$?
31849	echo "$as_me:$LINENO: \$? = $ac_status" >&5	31968	echo "$as_me:$LINENO: \$? = $ac_status" >&5
31850	(exit $ac_status); }; }; then	31969	(exit $ac_status); }; }; then
31851	ac_cv_lib_tunepimp_tp_SetPUIDCollisionThreshold=yes	31970	ac_cv_lib_tunepimp_tr_GetPUID=yes
31852	else	31971	else
31853	echo "$as_me: failed program was:" >&5	31972	echo "$as_me: failed program was:" >&5
31854	sed 's/^/\| /' conftest.$ac_ext >&5	31973	sed 's/^/\| /' conftest.$ac_ext >&5
31855		31974
31856	ac_cv_lib_tunepimp_tp_SetPUIDCollisionThreshold=no	31975	ac_cv_lib_tunepimp_tr_GetPUID=no
31857	fi	31976	fi
31858	rm -f conftest.err conftest.$ac_objext \	31977	rm -f conftest.err conftest.$ac_objext \
31859	conftest$ac_exeext conftest.$ac_ext	31978	conftest$ac_exeext conftest.$ac_ext
31860	LIBS=$ac_check_lib_save_LIBS	31979	LIBS=$ac_check_lib_save_LIBS
31861	fi	31980	fi
31862	echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tp_SetPUIDCollisionThreshold" >&5	31981	echo "$as_me:$LINENO: result: $ac_cv_lib_tunepimp_tr_GetPUID" >&5
31863	echo "${ECHO_T}$ac_cv_lib_tunepimp_tp_SetPUIDCollisionThreshold" >&6	31982	echo "${ECHO_T}$ac_cv_lib_tunepimp_tr_GetPUID" >&6
31864	if test $ac_cv_lib_tunepimp_tp_SetPUIDCollisionThreshold = yes; then	31983	if test $ac_cv_lib_tunepimp_tr_GetPUID = yes; then
31865		31984
31866	cat >>confdefs.h <<\_ACEOF	31985	cat >>confdefs.h <<\_ACEOF
31867	#define HAVE_TUNEPIMP 5	31986	#define HAVE_TUNEPIMP 5
Lines 31980-31985 Link Here
31980		32099
31981		32100
31982		32101
		32102
31983	kde_safe_cppflags=$CPPFLAGS	32103	kde_safe_cppflags=$CPPFLAGS
31984	CPPFLAGS="$CPPFLAGS $all_includes"	32104	CPPFLAGS="$CPPFLAGS $all_includes"
31985	ac_ext=cc	32105	ac_ext=cc

Lines 17-26 Link Here

(-)kid3-0.7/kid3/musicbrainzclient.cpp (-2 / +269 lines)
17	#define I18N_NOOP(s) QT_TR_NOOP(s)	17	#define I18N_NOOP(s) QT_TR_NOOP(s)
18	#endif	18	#endif
19	#include <qfile.h>	19	#include <qfile.h>
		20	#if HAVE_TUNEPIMP >= 5
		21	#include <qsocket.h>
		22	#include <qdom.h>
		23	#endif
20	#include "musicbrainzconfig.h"	24	#include "musicbrainzconfig.h"
21	#include "freedbclient.h"	25	#include "freedbclient.h"
22	#include "importtrackdata.h"	26	#include "importtrackdata.h"
23		27
		28	#if HAVE_TUNEPIMP >= 5
		29	/**
		30	* Constructor.
		31	*
		32	* @param numFiles number of files to be queried
		33	* @param serverName server name
		34	* @param serverPort server port
		35	* @param proxyName proxy name, empty if no proxy
		36	* @param proxyPort proxy port
		37	*/
		38	LookupQuery::LookupQuery(int numFiles,
		39	const QString& serverName, Q_UINT16 serverPort,
		40	const QString& proxyName, Q_UINT16 proxyPort) :
		41	m_numFiles(numFiles), m_serverName(serverName), m_serverPort(serverPort),
		42	m_proxyName(proxyName), m_proxyPort(proxyPort),
		43	m_currentFile(-1), m_fileQueries(new FileQuery[numFiles]),
		44	m_sock(new QSocket)
		45	{
		46	for (int i = 0; i < m_numFiles; ++i) {
		47	m_fileQueries[i].requested = false;
		48	m_fileQueries[i].puid = "";
		49	}
		50	connect(m_sock, SIGNAL(connected()),
		51	this, SLOT(socketConnected()));
		52	connect(m_sock, SIGNAL(error(int)),
		53	this, SLOT(socketError()));
		54	connect(m_sock, SIGNAL(connectionClosed()),
		55	this, SLOT(socketConnectionClosed()));
		56	}
		57
		58	/**
		59	* Destructor.
		60	*/
		61	LookupQuery::~LookupQuery()
		62	{
		63	m_sock->close();
		64	m_sock->disconnect();
		65	delete m_sock;
		66	delete [] m_fileQueries;
		67	}
		68
		69	/**
		70	* Connect to server to query information about the current file.
		71	*/
		72	void LookupQuery::socketQuery()
		73	{
		74	if (m_currentFile >= 0 && m_currentFile < m_numFiles) {
		75	QString destName = m_proxyName.isEmpty() ? m_serverName : m_proxyName;
		76	Q_UINT16 destPort = m_proxyName.isEmpty() ? m_serverPort : m_proxyPort;
		77	m_request = "GET http://";
		78	m_request += m_serverName;
		79	if (m_serverPort != 80) {
		80	m_request += ':';
		81	m_request += QString::number(m_serverPort);
		82	}
		83	m_request += "/ws/1/track/?type=xml&puid=";
		84	m_request += m_fileQueries[m_currentFile].puid;
		85	m_request += " HTTP/1.0\r\nHost: ";
		86	m_request += m_serverName;
		87	m_request += "\r\nUser-agent: Kid3/" VERSION "\r\n\r\n";
		88	m_sock->connectToHost(destName, destPort);
		89	m_fileQueries[m_currentFile].requested = true;
		90	}
		91	}
92
93	/**
94	* Query the next file.
95	*/
96	void LookupQuery::queryNext()
97	{
98	// handle the first pending query
99	for (int i = 0; i < m_numFiles; ++i) {
100	if (!m_fileQueries[i].requested &&
101	!m_fileQueries[i].puid.isEmpty()) {
102	m_currentFile = i;
103	socketQuery();
104	return;
105	}
106	}
107	// no pending query => socketQuery() will be done in next query()
108	m_currentFile = -1;
109	}
110
111	/**
112	* Query a PUID from the server.
113	*
114	* @param puid PUID
115	* @param index index of file
116	*/
117	void LookupQuery::query(const char* puid, int index)
118	{
119	m_fileQueries[index].puid = QString(puid);
120	// if no request is being executed, start the current request
121	if (m_currentFile < 0 \|\| m_currentFile >= m_numFiles \|\|
122	!m_fileQueries[m_currentFile].requested) {
123	m_currentFile = index;
124	socketQuery();
125	}
126	}
127
128	/**
129	* Send query when the socket is connected.
130	*/
131	void LookupQuery::socketConnected()
132	{
133	m_sock->writeBlock(m_request.latin1(), m_request.length());
134	}
135
136	/**
137	* Error on socket connection.
138	*/
139	void LookupQuery::socketError()
140	{
141	queryNext();
142	}
143
144	/**
145	* Read received data when the server has closed the connection.
146	*/
147	void LookupQuery::socketConnectionClosed()
148	{
149	Q_ULONG len = m_sock->bytesAvailable();
150	QCString buf;
151	buf.resize(len + 1 );
152	m_sock->readBlock(buf.data(), len);
153	m_sock->close();
154
155	int xmlStart = buf.find("<?xml");
156	if (xmlStart >= 0 &&
157	m_currentFile >= 0 && m_currentFile < m_numFiles &&
158	m_fileQueries[m_currentFile].requested) {
159	emit queryResponseReceived(m_currentFile, buf.mid(xmlStart, len - xmlStart));
160	}
161	queryNext();
162	}
163
164	#else
165
166	LookupQuery::LookupQuery(int, const QString&, Q_UINT16, const QString&, Q_UINT16) {}
167	LookupQuery::~LookupQuery() {}
168	void LookupQuery::socketConnected() {}
169	void LookupQuery::socketError() {}
170	void LookupQuery::socketConnectionClosed() {}
171
172	#endif
173
174
24	/**	175	/**
25	* Constructor.	176	* Constructor.
26	*	177	*
Lines 29-34 Link Here
29	*/	180	*/
30	MusicBrainzClient::MusicBrainzClient(ImportTrackDataVector& trackDataList) :	181	MusicBrainzClient::MusicBrainzClient(ImportTrackDataVector& trackDataList) :
31	m_trackDataVector(trackDataList), m_tp(0), m_ids(0), m_numFiles(0)	182	m_trackDataVector(trackDataList), m_tp(0), m_ids(0), m_numFiles(0)
		183	#if HAVE_TUNEPIMP >= 5
		184	, m_lookupQuery(0)
		185	#endif
32	{	186	{
33	m_tp = tp_New("kid3", VERSION);	187	m_tp = tp_New("kid3", VERSION);
34	#ifdef WIN32	188	#ifdef WIN32
Lines 39-45 Link Here
39	#else	193	#else
40	tp_SetUseUTF8(m_tp, 1);	194	tp_SetUseUTF8(m_tp, 1);
41	#endif	195	#endif
		196	#if HAVE_TUNEPIMP >= 5
		197	tp_SetMusicDNSClientId(m_tp, "a95f5c7cd37fd4bce12dc86d196fb4fe");
		198	#else
42	tp_SetAutoFileLookup(m_tp, 1);	199	tp_SetAutoFileLookup(m_tp, 1);
		200	#endif
43	tp_SetRenameFiles(m_tp, 0);	201	tp_SetRenameFiles(m_tp, 0);
44	tp_SetMoveFiles(m_tp, 0);	202	tp_SetMoveFiles(m_tp, 0);
45	tp_SetWriteID3v1(m_tp, 0);	203	tp_SetWriteID3v1(m_tp, 0);
Lines 110-117 Link Here
110	{ eUnrecognized, I18N_NOOP("Unrecognized") },	268	{ eUnrecognized, I18N_NOOP("Unrecognized") },
111	{ eRecognized, I18N_NOOP("Recognized") },	269	{ eRecognized, I18N_NOOP("Recognized") },
112	{ ePending, I18N_NOOP("Pending") },	270	{ ePending, I18N_NOOP("Pending") },
		271	#if HAVE_TUNEPIMP >= 5
		272	{ ePUIDLookup, I18N_NOOP("PUID Lookup") },
		273	{ ePUIDCollision, I18N_NOOP("PUID Collision") },
		274	#else
113	{ eTRMLookup, I18N_NOOP("TRM Lookup") },	275	{ eTRMLookup, I18N_NOOP("TRM Lookup") },
114	{ eTRMCollision, I18N_NOOP("TRM Collision") },	276	{ eTRMCollision, I18N_NOOP("TRM Collision") },
		277	#endif
115	{ eFileLookup, I18N_NOOP("File Lookup") },	278	{ eFileLookup, I18N_NOOP("File Lookup") },
116	{ eUserSelection, I18N_NOOP("User Selection") },	279	{ eUserSelection, I18N_NOOP("User Selection") },
117	{ eVerified, I18N_NOOP("Verified") },	280	{ eVerified, I18N_NOOP("Verified") },
Lines 163-169 Link Here
163	track_t track = tp_GetTrack(m_tp, id);	326	track_t track = tp_GetTrack(m_tp, id);
164	if (track) {	327	if (track) {
165	tr_Lock(track);	328	tr_Lock(track);
		329	#if HAVE_TUNEPIMP >= 5
		330	tr_GetPUID(track, trm, sizeof(trm));
		331	#else
166	tr_GetTRM(track, trm, sizeof(trm));	332	tr_GetTRM(track, trm, sizeof(trm));
		333	#endif
167	if (trm[0] == '\0') {	334	if (trm[0] == '\0') {
168	tr_SetStatus(track, ePending);	335	tr_SetStatus(track, ePending);
169	tp_Wake(m_tp, track);	336	tp_Wake(m_tp, track);
Lines 189-201 Link Here
189	ImportTrackData trackData;	356	ImportTrackData trackData;
190	getMetaData(id, trackData);	357	getMetaData(id, trackData);
191	emit metaDataReceived(index, trackData);	358	emit metaDataReceived(index, trackData);
192	} else if (statusCode == eTRMCollision \|\|	359	}
193	statusCode == eUserSelection) {	360	#if HAVE_TUNEPIMP >= 5
		361	else if (statusCode == ePUIDLookup \|\|
		362	statusCode == ePUIDCollision \|\|
		363	statusCode == eFileLookup) {
		364	char puid[255];
		365	puid[0] = '\0';
		366	track_t track = tp_GetTrack(m_tp, id);
		367	if (track) {
		368	tr_Lock(track);
		369	tr_GetPUID(track, puid, sizeof(puid));
		370	tr_Unlock(track);
		371	tp_ReleaseTrack(m_tp, track);
		372	}
		373	if (m_lookupQuery) {
		374	m_lookupQuery->query(puid, index);
		375	}
		376	}
		377	#else
		378	else if (statusCode == eTRMCollision \|\|
		379	statusCode == eUserSelection) {
194	ImportTrackDataVector trackDataList;	380	ImportTrackDataVector trackDataList;
195	if (getResults(id, trackDataList)) {	381	if (getResults(id, trackDataList)) {
196	emit resultsReceived(index, trackDataList);	382	emit resultsReceived(index, trackDataList);
197	}	383	}
198	}	384	}
		385	#endif
199	}	386	}
200	break;	387	break;
201	}	388	}
Lines 242-247 Link Here
242	m_numFiles = m_trackDataVector.count();	429	m_numFiles = m_trackDataVector.count();
243	#endif	430	#endif
244	m_ids = new int[m_numFiles];	431	m_ids = new int[m_numFiles];
		432	#if HAVE_TUNEPIMP >= 5
		433	char serverName[80], proxyName[80];
		434	short serverPort, proxyPort;
		435	tp_GetServer(m_tp, serverName, sizeof(serverName) - 1, &serverPort);
		436	tp_GetProxy(m_tp, proxyName, sizeof(proxyName) - 1, &proxyPort);
		437	m_lookupQuery = new LookupQuery(m_numFiles, serverName, serverPort,
		438	proxyName, proxyPort);
		439	connect(m_lookupQuery, SIGNAL(queryResponseReceived(int, const QCString&)),
		440	this, SLOT(parseLookupResponse(int, const QCString&)));
		441	#endif
245	int i = 0;	442	int i = 0;
246	for (	443	for (
247	#if QT_VERSION >= 300	444	#if QT_VERSION >= 300
Lines 271-276 Link Here
271	}	468	}
272	delete [] m_ids;	469	delete [] m_ids;
273	m_ids = 0;	470	m_ids = 0;
		471	#if HAVE_TUNEPIMP >= 5
		472	delete m_lookupQuery;
		473	m_lookupQuery = 0;
		474	#endif
274	m_numFiles = 0;	475	m_numFiles = 0;
275	}	476	}
276	}	477	}
Lines 308-313 Link Here
308	}	509	}
309	}	510	}
310		511
		512	#if HAVE_TUNEPIMP >= 5
		513
		514	bool MusicBrainzClient::getResults(int, ImportTrackDataVector&) {
		515	return false;
		516	}
		517
		518	/**
		519	* Process server response with lookup data.
		520	*
		521	* @param index index of file
		522	* @param response response from server
		523	*/
		524	void MusicBrainzClient::parseLookupResponse(int index, const QCString& response)
		525	{
		526	ImportTrackDataVector trackDataList;
		527	QDomDocument doc;
		528	if (doc.setContent(response)) {
		529	QDomElement trackList =
		530	doc.namedItem("metadata").toElement().namedItem("track-list").toElement();
		531
		532	for (QDomNode trackNode = trackList.namedItem("track");
		533	!trackNode.isNull();
		534	trackNode = trackNode.nextSibling()) {
		535	QDomElement track = trackNode.toElement();
		536
		537	ImportTrackData trackData;
		538	trackData.artist =
		539	track.namedItem("artist").toElement().namedItem("name").toElement().text();
		540	trackData.title = track.namedItem("title").toElement().text();
		541
		542	for (QDomNode releaseNode =
		543	track.namedItem("release-list").toElement().namedItem("release");
		544	!releaseNode.isNull();
		545	releaseNode = releaseNode.nextSibling() ) {
		546	QDomElement release = releaseNode.toElement();
		547
		548	trackData.album = release.namedItem("title").toElement().text();
		549	trackData.track = -1;
		550	QDomNode releaseTrackNode = release.namedItem("track-list");
		551	if (!releaseTrackNode.isNull()) {
		552	QDomElement releaseTrack = releaseTrackNode.toElement();
		553	if (!releaseTrack.attribute("offset").isEmpty())
		554	trackData.track = releaseTrack.attribute("offset").toInt() + 1;
		555	}
		556	}
		557	trackDataList.append(trackData);
		558	}
		559	}
		560
		561	if (trackDataList.size() > 1) {
		562	emit resultsReceived(index, trackDataList);
		563	emit statusChanged(index, i18n("User Selection"));
		564	} else if (trackDataList.size() == 1) {
		565	emit metaDataReceived(index, *trackDataList.begin());
		566	emit statusChanged(index, i18n("Recognized"));
		567	} else {
		568	emit statusChanged(index, i18n("Unrecognized"));
		569	}
		570	}
		571
		572	#else
		573
311	/**	574	/**
312	* Get results for an ambiguous file.	575	* Get results for an ambiguous file.
313	*	576	*
Lines 388-393 Link Here
388	return resultsAvailable;	651	return resultsAvailable;
389	}	652	}
390		653
		654	void MusicBrainzClient::parseLookupResponse(int, const QCString&) {}
		655
		656	#endif
		657
391	#else // HAVE_TUNEPIMP	658	#else // HAVE_TUNEPIMP
392		659
393	MusicBrainzClient::MusicBrainzClient(ImportTrackDataVector&) {}	660	MusicBrainzClient::MusicBrainzClient(ImportTrackDataVector&) {}

Lines 317-323 Link Here

(-)kid3-0.7/Makefile.in (-4 / +3 lines)
317	#>+ 3	317	#>+ 3
318	cd $(top_srcdir) && \	318	cd $(top_srcdir) && \
319	$(AUTOMAKE) --gnu Makefile	319	$(AUTOMAKE) --gnu Makefile
320	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/Makefile.in	320	cd $(top_srcdir) && perl admin/am_edit Makefile.in
321	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	321	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
322	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)	322	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
323		323
Lines 740-748 Link Here
740	# Otherwise a system limit (for SysV at least) may be exceeded.	740	# Otherwise a system limit (for SysV at least) may be exceeded.
741	.NOEXPORT:	741	.NOEXPORT:
742		742
743
744	#>+ 2	743	#>+ 2
745	KDE_DIST=configure.files kid3_ru.qm build-stamp kid3_de.qm configure.in.in stamp-h.in subdirs Makefile.in kid3_de.html kid3_en.html Makefile.cvs kid3_es.qm LICENSE	744	KDE_DIST=stamp-h.in subdirs Makefile.in kid3_de.html configure.files kid3_en.html kid3_ru.qm kid3_de.qm Makefile.cvs configure.in.in kid3_es.qm LICENSE
746		745
747	#>+ 2	746	#>+ 2
748	docs-am:	747	docs-am:
Lines 751-757 Link Here
751	force-reedit:	750	force-reedit:
752	cd $(top_srcdir) && \	751	cd $(top_srcdir) && \
753	$(AUTOMAKE) --gnu Makefile	752	$(AUTOMAKE) --gnu Makefile
754	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/Makefile.in	753	cd $(top_srcdir) && perl admin/am_edit Makefile.in
755		754
756		755
757	#>+ 21	756	#>+ 21

Lines 297-303 Link Here

(-)kid3-0.7/po/Makefile.in (-3 / +2 lines)
297	#>+ 3	297	#>+ 3
298	cd $(top_srcdir) && \	298	cd $(top_srcdir) && \
299	$(AUTOMAKE) --gnu po/Makefile	299	$(AUTOMAKE) --gnu po/Makefile
300	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/po/Makefile.in	300	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
301	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status	301	Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
302	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)	302	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
303		303
Lines 451-457 Link Here
451	# Otherwise a system limit (for SysV at least) may be exceeded.	451	# Otherwise a system limit (for SysV at least) may be exceeded.
452	.NOEXPORT:	452	.NOEXPORT:
453		453
454
455	#>+ 2	454	#>+ 2
456	KDE_DIST=ru.gmo de.po de.gmo es.po es.gmo kid3.pot ru.po Makefile.in	455	KDE_DIST=ru.gmo de.po de.gmo es.po es.gmo kid3.pot ru.po Makefile.in
457		456
Lines 511-517 Link Here
511	force-reedit:	510	force-reedit:
512	cd $(top_srcdir) && \	511	cd $(top_srcdir) && \
513	$(AUTOMAKE) --gnu po/Makefile	512	$(AUTOMAKE) --gnu po/Makefile
514	cd $(top_srcdir) && perl admin/am_edit -padmin kid3-0.7/po/Makefile.in	513	cd $(top_srcdir) && perl admin/am_edit po/Makefile.in
515		514
516		515
517	#>+ 21	516	#>+ 21