X-Git-Url: http://plrg.eecs.uci.edu/git/?p=smartapps.git;a=blobdiff_plain;f=official%2Fsonos-music-modes.groovy;h=811bde42dab3afb0e54b3aafa6243c2c2c6d5348;hp=f511c4262e4ce543a30b9cad0e3e3690b9c00853;hb=ec2a01c423801a5645cee1f748083d8a70299bd5;hpb=5c68db341ad16be89bb47a1422655c8403acccd9

diff --git a/official/sonos-music-modes.groovy b/official/sonos-music-modes.groovy
index f511c42..811bde4 100755
--- a/official/sonos-music-modes.groovy
+++ b/official/sonos-music-modes.groovy
@@ -40,6 +40,25 @@ preferences {
 }
 
 
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+	subscribeToEvents()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+	unsubscribe()
+	subscribeToEvents()
+}
+
+def subscribeToEvents() {
+	log.trace "subscribeToEvents()"
+	saveSelectedSongs()
+
+	subscribe(location, modeChangeHandler)
+}
+
+
 private songOptions() {
 	/*
 	// Make sure current selection is in the set
@@ -115,9 +134,9 @@ def mainPage() {
 			href "timeIntervalInput", title: "Only during a certain time"
 			input "days", "enum", title: "Only on certain days of the week", multiple: true, required: false,
 				options: ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
-			if (settings.modes) {
+			//if (settings.modes) {
             	input "modes", "mode", title: "Only when mode is", multiple: true, required: false
-            }
+          //  }
 			input "oncePerDay", "bool", title: "Only once per day", required: false, defaultValue: false
 		}
 	}
@@ -138,23 +157,6 @@ def chooseTrack() {
 	}
 }
 
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	subscribeToEvents()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-	unsubscribe()
-	subscribeToEvents()
-}
-
-def subscribeToEvents() {
-	log.trace "subscribeToEvents()"
-	saveSelectedSongs()
-
-	subscribe(location, modeChangeHandler)
-}
 
 def modeChangeHandler(evt) {
 	log.trace "modeChangeHandler($evt.name: $evt.value)"
@@ -174,7 +176,7 @@ def modeChangeHandler(evt) {
 private takeAction(evt) {
 
 	def name = "mode_$evt.value".toString()
-	def selectedSong = state.selectedSongs."$name"
+	def selectedSong = state.selectedSongs
 
 	if (selectedSong == "PAUSE") {
 		sonos.stop()