Update clip() method (add already paused support)

vmichalak · Nov 1, 2017 · 25c5150 · 25c5150
1 parent c8cab05
commit 25c5150
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/com/vmichalak/sonoscontroller/SonosDevice.java b/src/main/java/com/vmichalak/sonoscontroller/SonosDevice.java
@@ -62,15 +62,15 @@ public void playFromQueue(int queueIndex) throws IOException, SonosControllerExc
      * @throws InterruptedException
      */
     public void clip(String uri, String metadata) throws IOException, SonosControllerException, InterruptedException {
+        PlayState previousState = this.getPlayState();
         TrackInfo previous = this.getCurrentTrackInfo();
         this.playUri(uri, metadata);
-        while (this.getPlayState() != PlayState.STOPPED) {
-            Thread.sleep(500);
-        }
+        while (!this.getPlayState().equals(PlayState.STOPPED)) { Thread.sleep(500); }
         this.playUri("x-rincon-queue:" + this.getSpeakerInfo().getLocalUID() + "#0", "");
-        this.playFromQueue(previous.getQueueIndex());
+        CommandBuilder.transport("Seek").put("InstanceID", "0").put("Unit", "TRACK_NR")
+                .put("Target", String.valueOf(previous.getQueueIndex())).executeOn(this.ip);
         this.seek(previous.getPosition());
-        this.play();
+        if(previousState.equals(PlayState.PLAYING)) { this.play(); } else { this.pause(); }
     }
 
     /**

diff --git a/src/test/java/com/vmichalak/sonoscontroller/SonosDeviceTest.java b/src/test/java/com/vmichalak/sonoscontroller/SonosDeviceTest.java
@@ -502,7 +502,7 @@ public void getCurrentTrackInfo() throws Exception {
                 "album='Midnight', " +
                 "albumArtURI='https://i.scdn.co/image/1cc3ef402dc422472cebc5543749f0c89baaedc2'}",
                 sonosDevice.getCurrentTrackInfo().getMetadata().toString());
-        assertEquals("TrackInfo{playlistPosition=1, duration='0:03:21', position='0:00:17', " +
+        assertEquals("TrackInfo{queueIndex=1, duration='0:03:21', position='0:00:17', " +
                 "uri='x-sonos-spotify:spotify%3atrack%3a2UAUITgVFXb27TV58EWE6L?sid=9&flags=0&sn=3', " +
                 "metadata=TrackMetadata{title='Midnight', creator='Trinix', albumArtist='Trinix', " +
                 "album='Midnight', " +