diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2017-06-13 11:59:45 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2017-06-13 11:59:45 -0700 |
| commit | 9ff3e1a006a1071a0c5cb6d95a7383318d26a685 (patch) | |
| tree | f7033bd9314568d2b89d489cb4f25e82f388398f /app/src/main/java/github/daneren2005/dsub/service | |
| parent | 0666f94a98aa4bb9eb4bd46135ea69840b2e7e4f (diff) | |
| parent | d9531316f27b766c840503392c96520c1de0af8a (diff) | |
| download | dsub-9ff3e1a006a1071a0c5cb6d95a7383318d26a685.tar.gz dsub-9ff3e1a006a1071a0c5cb6d95a7383318d26a685.tar.bz2 dsub-9ff3e1a006a1071a0c5cb6d95a7383318d26a685.zip | |
Merge branch 'KBerstene-feature/rewindjumppreferences' into edge
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/service')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/service/DownloadService.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java index b32a042d..fe18ede0 100644 --- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java +++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java @@ -107,8 +107,6 @@ public class DownloadService extends Service { public static final String CMD_NEXT = "github.daneren2005.dsub.CMD_NEXT"; public static final String CANCEL_DOWNLOADS = "github.daneren2005.dsub.CANCEL_DOWNLOADS"; public static final String START_PLAY = "github.daneren2005.dsub.START_PLAYING"; - public static final int FAST_FORWARD = 30000; - public static final int REWIND = 10000; private static final long DEFAULT_DELAY_UPDATE_PROGRESS = 1000L; private static final double DELETE_CUTOFF = 0.84; private static final int REQUIRED_ALBUM_MATCHES = 4; @@ -1174,10 +1172,10 @@ public class DownloadService extends Service { } } public synchronized int rewind() { - return seekToWrapper(-REWIND); + return seekToWrapper(Integer.parseInt(Util.getPreferences(this).getString(Constants.PREFERENCES_KEY_REWIND_INTERVAL, "10"))*-1000); } public synchronized int fastForward() { - return seekToWrapper(FAST_FORWARD); + return seekToWrapper(Integer.parseInt(Util.getPreferences(this).getString(Constants.PREFERENCES_KEY_FASTFORWARD_INTERVAL, "30"))*1000); } protected int seekToWrapper(int difference) { int msPlayed = Math.max(0, getPlayerPosition()); |