From 1034cd06e683c2ebf2036719be0b0d85b295d61c Mon Sep 17 00:00:00 2001 From: Yaima Valdivia Date: Mon, 16 Nov 2015 12:59:53 -0800 Subject: [PATCH] Var names reversed --- .../speaker-control.src/speaker-control.groovy | 18 +++++++++--------- .../speaker-mood-music.groovy | 12 ++++++------ .../speaker-notify-with-sound.groovy | 12 ++++++------ .../speaker-weather-forecast.groovy | 14 +++++++------- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/smartapps/smartthings/speaker-control.src/speaker-control.groovy b/smartapps/smartthings/speaker-control.src/speaker-control.groovy index 0fc9982..66cd6bf 100644 --- a/smartapps/smartthings/speaker-control.src/speaker-control.groovy +++ b/smartapps/smartthings/speaker-control.src/speaker-control.groovy @@ -81,7 +81,7 @@ def mainPage() { ] } section { - input "speaker", "capability.musicPlayer", title: "Speaker music player", required: true + input "sonos", "capability.musicPlayer", title: "Speaker music player", required: true } section("More options", hideable: true, hidden: true) { input "volume", "number", title: "Set the volume volume", description: "0-100%", required: false @@ -201,31 +201,31 @@ private takeAction(evt) { log.debug "takeAction($actionType)" def options = [:] if (volume) { - speaker.setLevel(volume as Integer) + sonos.setLevel(volume as Integer) options.delay = 1000 } switch (actionType) { case "Play": - options ? speaker.on(options) : speaker.on() + options ? sonos.on(options) : sonos.on() break case "Stop Playing": - options ? speaker.off(options) : speaker.off() + options ? sonos.off(options) : sonos.off() break case "Toggle Play/Pause": - def currentStatus = speaker.currentValue("status") + def currentStatus = sonos.currentValue("status") if (currentStatus == "playing") { - options ? speaker.pause(options) : speaker.pause() + options ? sonos.pause(options) : sonos.pause() } else { - options ? speaker.play(options) : speaker.play() + options ? sonos.play(options) : sonos.play() } break case "Skip to Next Track": - options ? speaker.nextTrack(options) : speaker.nextTrack() + options ? sonos.nextTrack(options) : sonos.nextTrack() break case "Play Previous Track": - options ? speaker.previousTrack(options) : speaker.previousTrack() + options ? sonos.previousTrack(options) : sonos.previousTrack() break default: log.error "Action type '$actionType' not defined" diff --git a/smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy b/smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy index bfb2965..9c47731 100644 --- a/smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy +++ b/smartapps/smartthings/speaker-mood-music.src/speaker-mood-music.groovy @@ -31,7 +31,7 @@ private songOptions() { } // Query for recent tracks - def states = speaker.statesSince("trackData", new Date(0), [max:30]) + def states = sonos.statesSince("trackData", new Date(0), [max:30]) def dataMaps = states.collect{it.jsonValue} options.addAll(dataMaps.collect{it.station}) @@ -43,7 +43,7 @@ private saveSelectedSong() { try { def thisSong = song log.info "Looking for $thisSong" - def songs = speaker.statesSince("trackData", new Date(0), [max:30]).collect{it.jsonValue} + def songs = sonos.statesSince("trackData", new Date(0), [max:30]).collect{it.jsonValue} log.info "Searching ${songs.size()} records" def data = songs.find {s -> s.station == thisSong} @@ -125,7 +125,7 @@ def mainPage() { ifUnset "timeOfDay", "time", title: "At a Scheduled Time", required: false } section { - input "speaker", "capability.musicPlayer", title: "On this Speaker player", required: true + input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true } section("More options", hideable: true, hidden: true) { input "volume", "number", title: "Set the volume", description: "0-100%", required: false @@ -248,13 +248,13 @@ private takeAction(evt) { log.info "Playing '$state.selectedSong" if (volume != null) { - speaker.stop() + sonos.stop() pause(500) - speaker.setLevel(volume) + sonos.setLevel(volume) pause(500) } - speaker.playTrack(state.selectedSong) + sonos.playTrack(state.selectedSong) if (frequency || oncePerDay) { state[frequencyKey(evt)] = now() diff --git a/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy b/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy index a6bb17c..b9511c6 100644 --- a/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy +++ b/smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy @@ -92,7 +92,7 @@ def mainPage() { input "message","text",title:"Play this message", required:false, multiple: false } section { - input "speaker", "capability.musicPlayer", title: "On this Speaker player", required: true + input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true } section("More options", hideable: true, hidden: true) { input "resumePlaying", "bool", title: "Resume currently playing music after notification", required: false, defaultValue: true @@ -137,7 +137,7 @@ private songOptions() { } // Query for recent tracks - def states = speaker.statesSince("trackData", new Date(0), [max:30]) + def states = sonos.statesSince("trackData", new Date(0), [max:30]) def dataMaps = states.collect{it.jsonValue} options.addAll(dataMaps.collect{it.station}) @@ -149,7 +149,7 @@ private saveSelectedSong() { try { def thisSong = song log.info "Looking for $thisSong" - def songs = speaker.statesSince("trackData", new Date(0), [max:30]).collect{it.jsonValue} + def songs = sonos.statesSince("trackData", new Date(0), [max:30]).collect{it.jsonValue} log.info "Searching ${songs.size()} records" def data = songs.find {s -> s.station == thisSong} @@ -277,13 +277,13 @@ private takeAction(evt) { log.trace "takeAction()" if (song) { - speaker.playSoundAndTrack(state.sound.uri, state.sound.duration, state.selectedSong, volume) + sonos.playSoundAndTrack(state.sound.uri, state.sound.duration, state.selectedSong, volume) } else if (resumePlaying){ - speaker.playTrackAndResume(state.sound.uri, state.sound.duration, volume) + sonos.playTrackAndResume(state.sound.uri, state.sound.duration, volume) } else { - speaker.playTrackAndRestore(state.sound.uri, state.sound.duration, volume) + sonos.playTrackAndRestore(state.sound.uri, state.sound.duration, volume) } if (frequency || oncePerDay) { diff --git a/smartapps/smartthings/speaker-weather-forecast.src/speaker-weather-forecast.groovy b/smartapps/smartthings/speaker-weather-forecast.src/speaker-weather-forecast.groovy index c1dd026..bb3bc41 100644 --- a/smartapps/smartthings/speaker-weather-forecast.src/speaker-weather-forecast.groovy +++ b/smartapps/smartthings/speaker-weather-forecast.src/speaker-weather-forecast.groovy @@ -85,7 +85,7 @@ def mainPage() { ) } section { - input "speaker", "capability.musicPlayer", title: "On this Speaker player", required: true + input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true } section("More options", hideable: true, hidden: true) { input "resumePlaying", "bool", title: "Resume currently playing music after weather report finishes", required: false, defaultValue: true @@ -223,16 +223,16 @@ private takeAction(evt) { loadText() if (song) { - speaker.playSoundAndTrack(state.sound.uri, state.sound.duration, state.selectedSong, volume) + sonos.playSoundAndTrack(state.sound.uri, state.sound.duration, state.selectedSong, volume) } else if (resumePlaying){ - speaker.playTrackAndResume(state.sound.uri, state.sound.duration, volume) + sonos.playTrackAndResume(state.sound.uri, state.sound.duration, volume) } else if (volume) { - speaker.playTrackAtVolume(state.sound.uri, volume) + sonos.playTrackAtVolume(state.sound.uri, volume) } else { - speaker.playTrack(state.sound.uri) + sonos.playTrack(state.sound.uri) } if (frequency || oncePerDay) { @@ -254,7 +254,7 @@ private songOptions() { } // Query for recent tracks - def states = speaker.statesSince("trackData", new Date(0), [max:30]) + def states = sonos.statesSince("trackData", new Date(0), [max:30]) def dataMaps = states.collect{it.jsonValue} options.addAll(dataMaps.collect{it.station}) @@ -266,7 +266,7 @@ private saveSelectedSong() { try { def thisSong = song log.info "Looking for $thisSong" - def songs = speaker.statesSince("trackData", new Date(0), [max:30]).collect{it.jsonValue} + def songs = sonos.statesSince("trackData", new Date(0), [max:30]).collect{it.jsonValue} log.info "Searching ${songs.size()} records" def data = songs.find {s -> s.station == thisSong}