From f38b33ee5023ad863895f0ddd540de6dc0e8d313 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 9 Oct 2021 14:05:05 +0200 Subject: [PATCH] Scrobbler: Use seconds instead of minutes for submit delay --- src/scrobbler/listenbrainzscrobbler.cpp | 4 ++-- src/scrobbler/scrobblingapi20.cpp | 4 ++-- src/scrobbler/subsonicscrobbler.cpp | 2 +- src/settings/scrobblersettingspage.ui | 9 ++++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/scrobbler/listenbrainzscrobbler.cpp b/src/scrobbler/listenbrainzscrobbler.cpp index 3a54f12e0..82768382c 100644 --- a/src/scrobbler/listenbrainzscrobbler.cpp +++ b/src/scrobbler/listenbrainzscrobbler.cpp @@ -523,7 +523,7 @@ void ListenBrainzScrobbler::Scrobble(const Song &song) { Submit(); } else if (!timer_submit_.isActive()) { - timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * 60 * kMsecPerSec)); + timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * kMsecPerSec)); timer_submit_.start(); } } @@ -535,7 +535,7 @@ void ListenBrainzScrobbler::DoSubmit() { if (!submitted_ && cache_->Count() > 0) { submitted_ = true; if (!timer_submit_.isActive()) { - timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * 60 * kMsecPerSec)); + timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * kMsecPerSec)); timer_submit_.start(); } } diff --git a/src/scrobbler/scrobblingapi20.cpp b/src/scrobbler/scrobblingapi20.cpp index a91f9e994..df3163643 100644 --- a/src/scrobbler/scrobblingapi20.cpp +++ b/src/scrobbler/scrobblingapi20.cpp @@ -550,7 +550,7 @@ void ScrobblingAPI20::Scrobble(const Song &song) { Submit(); } else if (!timer_submit_.isActive()) { - timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * 60 * kMsecPerSec)); + timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * kMsecPerSec)); timer_submit_.start(); } } @@ -562,7 +562,7 @@ void ScrobblingAPI20::DoSubmit() { if (!submitted_ && cache()->Count() > 0) { submitted_ = true; if (!timer_submit_.isActive()) { - timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * 60 * kMsecPerSec)); + timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * kMsecPerSec)); timer_submit_.start(); } } diff --git a/src/scrobbler/subsonicscrobbler.cpp b/src/scrobbler/subsonicscrobbler.cpp index 70227320a..1456aa58d 100644 --- a/src/scrobbler/subsonicscrobbler.cpp +++ b/src/scrobbler/subsonicscrobbler.cpp @@ -94,7 +94,7 @@ void SubsonicScrobbler::Scrobble(const Song &song) { Submit(); } else if (!timer_submit_.isActive()) { - timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * 60 * kMsecPerSec)); + timer_submit_.setInterval(static_cast(app_->scrobbler()->SubmitDelay() * kMsecPerSec)); timer_submit_.start(); } } diff --git a/src/settings/scrobblersettingspage.ui b/src/settings/scrobblersettingspage.ui index 59b049f5b..d468d1dff 100644 --- a/src/settings/scrobblersettingspage.ui +++ b/src/settings/scrobblersettingspage.ui @@ -7,7 +7,7 @@ 0 0 460 - 1075 + 1103 @@ -70,11 +70,14 @@ - minutes + seconds + + 900 + @@ -95,7 +98,7 @@ - (This is the delay between when a song is scrobbled and when scrobbles are submitted to the server. Setting the time to 0 minutes will submit scrobbles immediately). + (This is the delay between when a song is scrobbled and when scrobbles are submitted to the server. Setting the time to 0 seconds will submit scrobbles immediately). true