aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-09-20 07:31:57 -0700
committerScott Jackson <daneren2005@gmail.com>2014-09-20 07:31:57 -0700
commite5fb6784104c852c234c074486ab03e47c470b67 (patch)
treef8824958c0ca5dcd98110dea729be019d4ff534b /src
parent49764baa821198b014efdfe6b856f32c49a1595a (diff)
downloaddsub-e5fb6784104c852c234c074486ab03e47c470b67.tar.gz
dsub-e5fb6784104c852c234c074486ab03e47c470b67.tar.bz2
dsub-e5fb6784104c852c234c074486ab03e47c470b67.zip
Fix web commits
Diffstat (limited to 'src')
-rw-r--r--src/github/daneren2005/dsub/service/DownloadService.java2
-rw-r--r--src/github/daneren2005/dsub/service/Scrobbler.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/github/daneren2005/dsub/service/DownloadService.java b/src/github/daneren2005/dsub/service/DownloadService.java
index 9d30889d..77090e33 100644
--- a/src/github/daneren2005/dsub/service/DownloadService.java
+++ b/src/github/daneren2005/dsub/service/DownloadService.java
@@ -915,7 +915,7 @@ public class DownloadService extends Service {
clearCurrentBookmark(true);
}
if(currentPlaying != null) {
- scrobbler.conditionalScrobble(context, currentPlaying, position, duration);
+ scrobbler.conditionalScrobble(this, currentPlaying, position, duration);
}
int index = getCurrentPlayingIndex();
diff --git a/src/github/daneren2005/dsub/service/Scrobbler.java b/src/github/daneren2005/dsub/service/Scrobbler.java
index 6772ec5d..239094fd 100644
--- a/src/github/daneren2005/dsub/service/Scrobbler.java
+++ b/src/github/daneren2005/dsub/service/Scrobbler.java
@@ -47,7 +47,8 @@ public class Scrobbler {
}
// Ignore songs which are under 30 seconds per Last.FM guidelines
- if(song.getDuration() != null && song.getDuration() > 0 && song.getDuration < 30) {
+ Integer duration = song.getSong().getDuration();
+ if(duration != null && duration > 0 && duration < 30) {
return;
}