diff options
| -rw-r--r-- | ChangeLog.rus | 2 | ||||
| -rw-r--r-- | src/plugins/General/scrobbler/lastfmscrobbler.cpp | 23 |
2 files changed, 21 insertions, 4 deletions
diff --git a/ChangeLog.rus b/ChangeLog.rus index a4f805c8a..19460e417 100644 --- a/ChangeLog.rus +++ b/ChangeLog.rus @@ -673,4 +673,4 @@ Version 0.2.3 * улучшен диалог настроек * удалена зависимость от QtXML в модуле scrobbler * отключён по умолчанию модуль udisks -* поддержка ffmpeg 0.6-0.8 перемещена в отдельный модуль
\ No newline at end of file +* поддержка ffmpeg 0.6-0.8 перемещена в отдельный модуль diff --git a/src/plugins/General/scrobbler/lastfmscrobbler.cpp b/src/plugins/General/scrobbler/lastfmscrobbler.cpp index ba414f58b..2a449c410 100644 --- a/src/plugins/General/scrobbler/lastfmscrobbler.cpp +++ b/src/plugins/General/scrobbler/lastfmscrobbler.cpp @@ -123,17 +123,29 @@ LastfmScrobbler::~LastfmScrobbler() void LastfmScrobbler::setState(Qmmp::State state) { + static Qmmp::State previousState = state; + static int elapsed = 0; m_state = state; switch ((uint) state) { case Qmmp::Playing: - m_start_ts = QDateTime::currentDateTime().toTime_t(); + if (previousState != Qmmp::Paused) + { + qDebug("LastfmScrobbler: new song started"); + m_start_ts = QDateTime::currentDateTime().toTime_t(); + elapsed = 0; + } + else + { + qDebug("LastfmScrobbler: resuming after pause, %d seconds played", elapsed / 1000); + } m_time->restart(); break; case Qmmp::Stopped: + elapsed += m_time->elapsed(); if (!m_song.metaData().isEmpty() - && ((m_time->elapsed ()/1000 > 240) || (m_time->elapsed ()/1000 > int(m_song.length()/2))) - && (m_song.length() > MIN_SONG_LENGTH)) + && ((elapsed / 1000 > 240) || (elapsed / 1000 > int(m_song.length()/2))) + && (m_song.length() > MIN_SONG_LENGTH)) { m_song.setTimeStamp(m_start_ts); m_cachedSongs << m_song; @@ -147,9 +159,14 @@ void LastfmScrobbler::setState(Qmmp::State state) if (!m_session.isEmpty() && !m_submitReply) submit(); break; + case Qmmp::Paused: + elapsed += m_time->restart(); + qDebug("LastfmScrobbler: pausing after %d seconds played", elapsed / 1000); + break; default: ; } + previousState = state; } void LastfmScrobbler::updateMetaData() |