From 0ffa05b536ad907e63d34a1ab7244ce159354269 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 17 Feb 2009 11:17:47 +0000 Subject: 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 --- src/plugins/General/scrobbler/scrobbler.cpp | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'src/plugins/General/scrobbler/scrobbler.cpp') 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 #include #include +#include #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()); -- cgit v1.2.3-13-gbd6f