X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartthings-infrastructure.git;a=blobdiff_plain;f=MusicPlayer%2FMusicPlayers.groovy;h=92f6c550a9db80f957165d58bc7b713a946d99de;hp=a9693db8d3965047a64a0b9175ef0f89c7da35c9;hb=43db66bdb5ba7a2f07e9cbb04e0c44fddd6510be;hpb=8556a42043486d0c2852a9344a7c0df8c79d73fd

diff --git a/MusicPlayer/MusicPlayers.groovy b/MusicPlayer/MusicPlayers.groovy
index a9693db..92f6c55 100644
--- 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()