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

Fix setting of track fields

Browse Source 
Issue #900
This commit is contained in:
Craig Drummond
2016-10-25 20:24:55 +01:00
committed by Craig Drummond
parent 5d5bbea5d4
commit 0968d45a29
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mpd-interface/song.cpp
View File

@@ -429,6 +429,7 @@ void Song::clear()
track = 0;
// pos = 0;
disc = 0;
blank = 0;
year = 0;
for (int i=0; i<constNumGenres; ++i) {
genres[i]=QString();

17
scrobbling/scrobbler.cpp
View File

@@ -147,13 +147,13 @@ static QString cacheName(bool createDir)
Scrobbler::Track::Track(const Song &s)
{
if (!s.blank&Song::BlankTitle) {
if (!(s.blank&Song::BlankTitle)) {
title=s.title;
}
if (!s.blank&Song::BlankArtist) {
if (!(s.blank&Song::BlankArtist)) {
artist=s.artist;
}
if (!s.blank&Song::BlankAlbum) {
if (!(s.blank&Song::BlankAlbum)) {
album=s.album;
}
albumartist=s.albumartist;
@@ -335,7 +335,9 @@ void Scrobbler::love()
sign(params);
DBUG << song.title << song.artist;
loveSent=true;
if (!fakeScrobbling) {
if (fakeScrobbling) {
DBUG << "MSG" << params;
} else {
QNetworkReply *job=NetworkAccessManager::self()->postFormData(QUrl(scrobblerUrl()), format(params));
connect(job, SIGNAL(finished()), this, SLOT(handleResp()));
}
@@ -386,7 +388,7 @@ void Scrobbler::calcScrobbleIntervals()
void Scrobbler::setSong(const Song &s)
{
DBUG << isEnabled() << s.isStandardStream() << s.time << s.file << s.title << s.artist << s.album << s.albumartist;
DBUG << isEnabled() << s.isStandardStream() << s.time << s.file << s.title << s.artist << s.album << s.albumartist << s.blank;
if (!scrobbleViaMpd && !isEnabled()) {
if (inactiveSong.artist != s.artist || inactiveSong.title!=s.title || inactiveSong.album!=s.album) {
emit songChanged(!s.isStandardStream() && !s.isEmpty());
@@ -443,7 +445,9 @@ void Scrobbler::scrobbleNowPlaying()
DBUG << currentSong.title << currentSong.artist << currentSong.albumartist << currentSong.album << currentSong.track << currentSong.length;
nowPlayingSent=true;
lastNowPlaying=time(NULL);
if (!fakeScrobbling) {
if (fakeScrobbling) {
DBUG << "MSG" << params;
} else {
QNetworkReply *job=NetworkAccessManager::self()->postFormData(QUrl(scrobblerUrl()), format(params));
connect(job, SIGNAL(finished()), this, SLOT(handleResp()));
}
@@ -510,6 +514,7 @@ void Scrobbler::scrobbleQueued()
params["sk"] = sessionKey;
sign(params);
if (fakeScrobbling) {
DBUG << "MSG" << params;
lastScrobbledSongs.clear();
} else {
scrobbleJob=NetworkAccessManager::self()->postFormData(scrobblerUrl(), format(params));