iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update current song to scrobble, even if disabled, so that when enabled we can scrobble.

Browse Source 
BUG: 510
This commit is contained in:
craig.p.drummond
2014-07-24 19:22:14 +00:00
parent 59b7c5a0f1
commit f06cec7b7e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -16,6 +16,8 @@
1. Remove unused var warning when compiling without online services.
2. Remove some moc/QObject warnings in KDE builds without streams or http
server.
3. Update current song to scrobble, even if disabled, so that when enabled we
can scrobble.
1.4.0
-----

10
scrobbling/scrobbler.cpp
View File

@@ -192,6 +192,7 @@ Scrobbler::Scrobbler()
connect(this, SIGNAL(clientMessage(QString,QString,QString)), MPDConnection::self(), SLOT(sendClientMessage(QString,QString,QString)));
connect(MPDConnection::self(), SIGNAL(clientMessageFailed(QString,QString)), SLOT(clientMessageFailed(QString,QString)));
connect(MPDConnection::self(), SIGNAL(statusUpdated(MPDStatusValues)), this, SLOT(mpdStatusUpdated(MPDStatusValues)));
connect(MPDConnection::self(), SIGNAL(currentSongUpdated(Song)), this, SLOT(setSong(Song)));
}
Scrobbler::~Scrobbler()
@@ -216,10 +217,8 @@ void Scrobbler::setActive()
if (isEnabled() || scrobbleViaMpd) {
connect(MPDStatus::self(), SIGNAL(updated()), this, SLOT(mpdStateUpdated()));
connect(MPDConnection::self(), SIGNAL(currentSongUpdated(Song)), this, SLOT(setSong(Song)));
} else {
disconnect(MPDStatus::self(), SIGNAL(updated()), this, SLOT(mpdStateUpdated()));
disconnect(MPDConnection::self(), SIGNAL(currentSongUpdated(Song)), this, SLOT(setSong(Song)));
}
if (!isAuthenticated()) {
@@ -333,13 +332,12 @@ void Scrobbler::setLoveEnabled(bool e)
void Scrobbler::setSong(const Song &s)
{
DBUG << isEnabled() << s.isStandardStream() << s.time << s.file;
if (!scrobbleViaMpd && !isEnabled()) {
return;
}
if (currentSong.artist != s.artist || currentSong.title!=s.title || currentSong.album!=s.album) {
nowPlayingSent=scrobbledCurrent=loveSent=lovePending=nowPlayingIsPending=false;
currentSong=s;
if (!scrobbleViaMpd && !isEnabled()) {
return;
}
emit songChanged(!s.isStandardStream() && !s.isEmpty());
if (scrobbleViaMpd || !isEnabled() || s.isStandardStream() || s.time<30) {
return;