Improvements and new methods

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

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index a9693db8d3965047a64a0b9175ef0f89c7da35c9..92f6c550a9db80f957165d58bc7b713a946d99de 100644 (file)
--- a/MusicPlayer/MusicPlayers.groovy
+++ b/MusicPlayer/MusicPlayers.groovy
@@ -172,6 +172,15 @@ public class MusicPlayers {
                        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) {
@@ -238,7 +247,7 @@ public class MusicPlayers {
                }
        }
        def statesSince(String info, Date dateObj, LinkedHashMap map) {
-               return presenceSensors[0].statesSince()
+               return musicPlayers[0].statesSince()
        }
        def playText(LinkedHashMap metaData) {
                playText()