Improvements and new methods

[smartthings-infrastructure.git] / MusicPlayer / MusicPlayers.groovy

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index e476a8df8595833f760f3ffac44afc7a73abdee6..92f6c550a9db80f957165d58bc7b713a946d99de 100644 (file)
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -2,9 +2,6 @@
 package MusicPlayer
 import Timer.SimulatedTimer
 
-//JPF's Verify API
-import gov.nasa.jpf.vm.Verify
-
 public class MusicPlayers {
        private int deviceNumbers
        private List musicPlayers
@@ -15,6 +12,7 @@ public class MusicPlayers {
        private String label = "musicPlayer0"
        private String displayName = "musicPlayer0"
        private int level = 20
+       private int duration = 10
        private String mute = "unmuted"
        private String status = "pause"
        private int trackNumber = 1
@@ -23,41 +21,28 @@ public class MusicPlayers {
 
        
                
-       MusicPlayers(Closure sendEvent, int deviceNumbers) {
+       MusicPlayers(Closure sendEvent, int deviceNumbers, boolean init) {
                this.sendEvent = sendEvent
                this.deviceNumbers = deviceNumbers
                this.musicPlayers = []
-
-               /*def initLevel = Verify.getIntFromList(10, 20, 30)
-               this.level = initLevel
-               def initMute = Verify.getBoolean()
-               if (initMute) {
+               
+               if (init) {
+                       this.level = 20
+                       this.duration = 10
                        this.mute = "unmuted"
-               } else {
-                       this.mute = "muted"
-               }
-               def initStatus = Verify.getInt(0,2)
-               if (initStatus == 0) {
                        this.status = "paused"
-               } else if (initStatus == 1) {
-                       this.status = "playing"
-               } else {
-                       this.status = "stopped"
-               }
-               def initTrack = Verify.getIntFromList(1, 2, 3)
-               this.trackNumber = initTrack 
-               def initData = Verify.getBoolean()
-               if (initData) {
+                       this.trackNumber = 1
                        this.trackData = "someTrack"
-               } else {
-                       this.trackData = "someOtherTrack"
-               }
-               def initDesc = Verify.getBoolean()
-               if (initDesc) {
                        this.trackDescription = "someDescriptions"
                } else {
+                       this.level = 30
+                       this.duration = 20
+                       this.mute = "muted"
+                       this.status = "playing"
+                       this.trackNumber = 2
+                       this.trackData = "someOtherTrack"
                        this.trackDescription = "someOtherDescriptions"
-               }*/
+               }
                musicPlayers.add(new MusicPlayer(sendEvent, id, label, displayName, this.level, this.mute, this.status, this.trackNumber, this.trackData, this.trackDescription))
        }
 
@@ -173,7 +158,34 @@ public class MusicPlayers {
                }
        }
        def playTrack(LinkedHashMap metaData) {
-               playTrack()
+               playTrack("someTrack")
+       }
+       def playTrackAndResume(String trackData, int duration) {
+               playTrack(trackData)
+               if (duration != this.duration) {
+                       this.duration = duration
+               }
+       }
+       def playTrackAndResume(String trackData, int duration, int level) {
+               playTrackAndResume(trackData, duration)
+               if (level != this.level) {
+                       this.level = level
+               }
+       }
+       def playSoundAndTrack(String trackData, int duration, int trackNumber, int level) {
+               playTrackAndResume(trackData, duration)
+               if (level != this.level) {
+                       this.level = level
+               }
+               if (trackNumber!= this.trackNumber) {
+                       this.trackNumber = trackNumber
+               }
+       }
+       def playTrackAtVolume(String trackData, int level) {
+               playTrack(trackData)
+               if (level != this.level) {
+                       this.level = level
+               }
        }
        def playTrack(String trackToPlay) {
                if (status != "play") {
@@ -234,6 +246,9 @@ public class MusicPlayers {
                        musicPlayers[0].stop()
                }
        }
+       def statesSince(String info, Date dateObj, LinkedHashMap map) {
+               return musicPlayers[0].statesSince()
+       }
        def playText(LinkedHashMap metaData) {
                playText()
        }