scrobbler: refactoring again

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

1 files changed, 5 insertions, 8 deletions

diff --git a/src/plugins/General/scrobbler/scrobblerhandler.cpp b/src/plugins/General/scrobbler/scrobblerhandler.cpp
index ed343f23b..17f375f01 100644
--- a/src/plugins/General/scrobbler/scrobblerhandler.cpp
+++ b/src/plugins/General/scrobbler/scrobblerhandler.cpp
@@ -18,12 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#define SCROBBLER_LIBREFM_URL "turtle.libre.fm"
-#define SCROBBLER_LASTFM_URL "ws.audioscrobbler.com/2.0"
-
 #include <QSettings>
-#include "scrobbler.h"
-#include "scrobbler2.h"
+#include "lastfmscrobbler.h"
+#include "librefmscrobbler.h"
 #include "scrobblerhandler.h"
 
 ScrobblerHandler::ScrobblerHandler(QObject *parent) : QObject(parent)
@@ -32,12 +29,12 @@ ScrobblerHandler::ScrobblerHandler(QObject *parent) : QObject(parent)
     settings.beginGroup("Scrobbler");
     if(settings.value("use_lastfm", false).toBool())
     {
-        new Scrobbler2(SCROBBLER_LASTFM_URL, "lastfm", this);
+        new LastfmScrobbler(this);
     }
     if(settings.value("use_librefm", false).toBool())
     {
-        new Scrobbler(SCROBBLER_LIBREFM_URL, settings.value("librefm_login").toString(),
-                   settings.value("librefm_password").toString(), "librefm", this);
+        new LibrefmScrobbler(settings.value("librefm_login").toString(),
+                             settings.value("librefm_password").toString(), this);
 
     }
     settings.endGroup();