aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/scrobbler/scrobbler.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-01-21 18:54:29 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2013-01-21 18:54:29 +0000
commitd370ae8951e89fc41260636fb5e2993858945c7c (patch)
tree3f9fc46783ba8ed9731edd71c0a068ff9e91b57e /src/plugins/General/scrobbler/scrobbler.cpp
parent016961e11e1414c02e5b52d5ffd8b7a6a2b91c74 (diff)
downloadqmmp-d370ae8951e89fc41260636fb5e2993858945c7c.tar.gz
qmmp-d370ae8951e89fc41260636fb5e2993858945c7c.tar.bz2
qmmp-d370ae8951e89fc41260636fb5e2993858945c7c.zip
improved scrobbler plugin, removed QtXML dependence
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@3182 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/scrobbler/scrobbler.cpp')
-rw-r--r--src/plugins/General/scrobbler/scrobbler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index b49008c8a..9cb824d81 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2008-2012 by Ilya Kotov *
+ * Copyright (C) 2008-2013 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
#define PROTOCOL_VER "1.2.1"
#define CLIENT_ID "qmm"
-#define CLIENT_VER "0.5"
+#define CLIENT_VER "0.7"
Scrobbler::Scrobbler(const QString &url,
@@ -49,7 +49,6 @@ Scrobbler::Scrobbler(const QString &url,
m_failure_count = 0;
m_handshake_count = 0;
m_http = new QNetworkAccessManager(this);
- m_state = Qmmp::Stopped;
m_login = login;
m_passw = passw;
m_server = url;
@@ -110,6 +109,7 @@ Scrobbler::Scrobbler(const QString &url,
}
file.close();
}
+ m_start_ts = QDateTime::currentDateTime().toTime_t();
if (!m_disabled)
handshake();
}
@@ -123,7 +123,6 @@ Scrobbler::~Scrobbler()
void Scrobbler::setState(Qmmp::State state)
{
- m_state = state;
switch ((uint) state)
{
case Qmmp::Playing:
@@ -157,7 +156,7 @@ void Scrobbler::setState(Qmmp::State state)
void Scrobbler::updateMetaData()
{
QMap <Qmmp::MetaData, QString> metadata = m_core->metaData();
- if (m_state == Qmmp::Playing
+ if (m_core->state() == Qmmp::Playing
&& !metadata.value(Qmmp::TITLE).isEmpty() //skip empty tags
&& !metadata.value(Qmmp::ARTIST).isEmpty()
&& m_core->totalTime() //skip stream
@@ -194,6 +193,7 @@ void Scrobbler::processResponse(QNetworkReply *reply)
if (reply == m_handshakeReply)
{
+ m_handshakeReply = 0;
m_submitUrl.clear();
m_session.clear();
m_nowPlayingUrl.clear();