From 015940e1a50a3922c350bfdfd4e7f19674a341b3 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Wed, 2 Sep 2009 17:56:24 +0000 Subject: fixed problems with lyricwiki (Fixes issue 158) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1172 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/General/lyrics/lyricswindow.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp index f4df89bc5..04fb7f330 100644 --- a/src/plugins/General/lyrics/lyricswindow.cpp +++ b/src/plugins/General/lyrics/lyricswindow.cpp @@ -44,7 +44,6 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget Qmmp::useProxyAuth() ? Qmmp::proxy().password() : QString()); connect(m_http, SIGNAL(done(bool)), SLOT(showText(bool))); connect(m_http, SIGNAL(stateChanged(int)), SLOT(showState (int))); - m_http->setHost("lyricwiki.org"); on_searchPushButton_clicked(); } @@ -68,12 +67,14 @@ void LyricsWindow::showText(bool error) if(url_regexp.indexIn(content) > 1) { QString url = qPrintable(url_regexp.cap(1)); - qDebug("LyricsWindow: url=%s", qPrintable(url)); + qDebug("LyricsWindow: url1=%s", qPrintable(url)); if(url.endsWith("action=edit")) ui.textEdit->setHtml(""+tr("Not found")+""); else { url.replace("lyricwiki.org", "lyrics.wikia.com/lyrics"); + m_http->setHost("lyrics.wikia.com"); + qDebug("LyricsWindow: url2=%s", qPrintable(url)); m_http->get(url); } } @@ -133,6 +134,7 @@ void LyricsWindow::showState(int state) void LyricsWindow::on_searchPushButton_clicked() { + m_http->setHost("lyricwiki.org"); setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(ui.artistLineEdit->text()).arg(ui.titleLineEdit->text())); m_http->get("/api.php?func=getSong&artist=" + QUrl::toPercentEncoding(ui.artistLineEdit->text()) +"&song=" + QUrl::toPercentEncoding(ui.titleLineEdit->text()) +"&fmt=html"); -- cgit v1.2.3-13-gbd6f