aboutsummaryrefslogtreecommitdiff
path: root/src/github
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2013-10-14 22:29:04 -0700
committerScott Jackson <daneren2005@gmail.com>2013-10-14 22:29:04 -0700
commit58f93512e28e4e84125eff0ab4c7a3ca2cb7d4ce (patch)
treee28fc519383e572399c8b418aefedb3148e38a30 /src/github
parentd3d1b3f3f09064d9b5811a78458bc421d1287a88 (diff)
downloaddsub-58f93512e28e4e84125eff0ab4c7a3ca2cb7d4ce.tar.gz
dsub-58f93512e28e4e84125eff0ab4c7a3ca2cb7d4ce.tar.bz2
dsub-58f93512e28e4e84125eff0ab4c7a3ca2cb7d4ce.zip
Fix jukebox not being able to change position
Diffstat (limited to 'src/github')
-rw-r--r--src/github/daneren2005/dsub/service/JukeboxController.java2
-rw-r--r--src/github/daneren2005/dsub/service/RESTMusicService.java4
2 files changed, 1 insertions, 5 deletions
diff --git a/src/github/daneren2005/dsub/service/JukeboxController.java b/src/github/daneren2005/dsub/service/JukeboxController.java
index fcd58e01..faace3ae 100644
--- a/src/github/daneren2005/dsub/service/JukeboxController.java
+++ b/src/github/daneren2005/dsub/service/JukeboxController.java
@@ -104,7 +104,7 @@ public class JukeboxController extends RemoteController {
if (jukeboxStatus != null) {
jukeboxStatus.setPositionSeconds(seconds);
}
- tasks.add(new Skip(-1, seconds));
+ tasks.add(new Skip(downloadService.getCurrentPlayingIndex(), seconds));
downloadService.setPlayerState(PlayerState.STARTED);
}
@Override
diff --git a/src/github/daneren2005/dsub/service/RESTMusicService.java b/src/github/daneren2005/dsub/service/RESTMusicService.java
index 09a1d6fe..77107d01 100644
--- a/src/github/daneren2005/dsub/service/RESTMusicService.java
+++ b/src/github/daneren2005/dsub/service/RESTMusicService.java
@@ -732,10 +732,6 @@ public class RESTMusicService implements MusicService {
public RemoteStatus skipJukebox(int index, int offsetSeconds, Context context, ProgressListener progressListener) throws Exception {
List<String> parameterNames = Arrays.asList("action", "index", "offset");
List<Object> parameterValues = Arrays.<Object>asList("skip", index, offsetSeconds);
- if(index < 0) {
- parameterNames.remove(1);
- parameterValues.remove(1);
- }
return executeJukeboxCommand(context, progressListener, parameterNames, parameterValues);
}