fixed proxy support, fixed xspf version

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@790 90c681e8-e032-0410-971d-27865f9a5e38

2 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/General/lyrics/lyricswindow.cpp b/src/plugins/General/lyrics/lyricswindow.cpp
index 744ad07f0..dc781bcc4 100644
--- a/src/plugins/General/lyrics/lyricswindow.cpp
+++ b/src/plugins/General/lyrics/lyricswindow.cpp
@@ -20,6 +20,7 @@
 
 #include <QHttp>
 #include <QUrl>
+#include <qmmp/qmmp.h>
 
 #include "lyricswindow.h"
 
@@ -30,8 +31,13 @@ LyricsWindow::LyricsWindow(const QString &artist, const QString &title, QWidget
     setWindowFlags(Qt::Dialog);
     setAttribute(Qt::WA_DeleteOnClose);
     setWindowTitle(QString(tr("Lyrics: %1 - %2")).arg(artist).arg(title));
-    //TODO proxy support
     m_http = new QHttp(this);
+    //load global proxy settings
+    if (Qmmp::useProxy())
+        m_http->setProxy(Qmmp::proxy().host(),
+                         Qmmp::proxy().port(),
+                         Qmmp::useProxyAuth() ? Qmmp::proxy().userName() : QString(),
+                         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");
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index af0ecd40b..8cf79d4c6 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -27,6 +27,7 @@
 #include <QSettings>
 #include <QDir>
 #include <qmmp/soundcore.h>
+#include <qmmp/qmmp.h>
 
 #include "scrobbler.h"
 
@@ -47,19 +48,12 @@ Scrobbler::Scrobbler(QObject *parent)
     m_login = settings.value("login").toString();
     m_passw = settings.value("password").toString();
     settings.endGroup();
-    //use global proxy settings
-    if (settings.value ("Proxy/use_proxy", FALSE).toBool())
-    {
-
-        if (settings.value ("Proxy/authentication", FALSE).toBool())
-            m_http->setProxy(settings.value("Proxy/host").toString(),
-                             settings.value("Proxy/port").toInt(),
-                             settings.value("Proxy/user").toString(),
-                             settings.value("Proxy/passw").toString());
-        else
-            m_http->setProxy(settings.value("Proxy/host").toString(),
-                             settings.value("Proxy/port").toInt());
-    }
+    //load global proxy settings
+    if (Qmmp::useProxy())
+        m_http->setProxy(Qmmp::proxy().host(),
+                         Qmmp::proxy().port(),
+                         Qmmp::useProxyAuth() ? Qmmp::proxy().userName() : QString(),
+                         Qmmp::useProxyAuth() ? Qmmp::proxy().password() : QString());
 
     m_disabled = m_login.isEmpty() || m_passw.isEmpty();
     m_passw = QString(QCryptographicHash::hash(m_passw.toAscii(), QCryptographicHash::Md5).toHex());