aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-09-02 17:56:24 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2009-09-02 17:56:24 +0000
commit015940e1a50a3922c350bfdfd4e7f19674a341b3 (patch)
tree9b50ff5898503fcf8751f2cbb4371545e85f1c74
parent5441c62909204e7467c8dd0655093acfbf234ffa (diff)
downloadqmmp-015940e1a50a3922c350bfdfd4e7f19674a341b3.tar.gz
qmmp-015940e1a50a3922c350bfdfd4e7f19674a341b3.tar.bz2
qmmp-015940e1a50a3922c350bfdfd4e7f19674a341b3.zip
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
-rw-r--r--src/plugins/General/lyrics/lyricswindow.cpp6
1 files changed, 4 insertions, 2 deletions
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("<b>"+tr("Not found")+"</b>");
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");