From d8958aca2fbb3a33ba11c63697c5fac85b38a007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20D=C3=BCrnberger?= Date: Sun, 30 Apr 2017 17:39:21 +0200 Subject: [PATCH] #22 --- lib/requestHandlers/lib.request.loadContainer.js | 2 +- lib/requestHandlers/lib.request.loadLineIn.js | 2 +- lib/requestHandlers/lib.request.loadPlaylist.js | 2 +- lib/requestHandlers/lib.request.loadShuffle.js | 2 +- lib/requestHandlers/lib.request.loadSingle.js | 2 +- lib/requestHandlers/lib.request.loadUri.js | 2 +- lib/requestHandlers/lib.request.mute.js | 4 ++-- lib/requestHandlers/lib.request.setVolume.js | 10 +++++----- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/requestHandlers/lib.request.loadContainer.js b/lib/requestHandlers/lib.request.loadContainer.js index 07e1bbc..2ef3dfa 100644 --- a/lib/requestHandlers/lib.request.loadContainer.js +++ b/lib/requestHandlers/lib.request.loadContainer.js @@ -20,7 +20,7 @@ module.exports = class Request_LoadContainer extends RequestMediaRenderer var value = this.getQueryValue("value", ""); var trackNumber = parseInt(this.getQueryValue("trackNumber", 1)); - _mediaRendererVirtual.loadContainer(value, "", trackNumber).then(function(_data){ + _mediaRendererVirtual.loadContainer(value, "", trackNumber, false, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.loadLineIn.js b/lib/requestHandlers/lib.request.loadLineIn.js index 3e0670b..d1e91a1 100644 --- a/lib/requestHandlers/lib.request.loadLineIn.js +++ b/lib/requestHandlers/lib.request.loadLineIn.js @@ -21,7 +21,7 @@ module.exports = class Request_LoadLineIn extends RequestMediaRenderer if (value == "") value = this.getQueryValue("value", ""); - _mediaRendererVirtual.loadLineIn(value).then(function(_data){ + _mediaRendererVirtual.loadLineIn(value, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.loadPlaylist.js b/lib/requestHandlers/lib.request.loadPlaylist.js index 0f7fbef..fa60dfa 100644 --- a/lib/requestHandlers/lib.request.loadPlaylist.js +++ b/lib/requestHandlers/lib.request.loadPlaylist.js @@ -27,7 +27,7 @@ module.exports = class Request_LoadPlaylist extends RequestMediaRenderer return; } - _mediaRendererVirtual.loadPlaylist(value, trackNumber).then(function(_data){ + _mediaRendererVirtual.loadPlaylist(value, trackNumber, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.loadShuffle.js b/lib/requestHandlers/lib.request.loadShuffle.js index f5e0ccf..9326e5f 100644 --- a/lib/requestHandlers/lib.request.loadShuffle.js +++ b/lib/requestHandlers/lib.request.loadShuffle.js @@ -20,7 +20,7 @@ module.exports = class Request_LoadShuffle extends RequestMediaRenderer var value = this.getQueryValue("value", ""); var selection = this.getQueryValue("selection", ""); - _mediaRendererVirtual.loadShuffle(value, selection).then(function(_data){ + _mediaRendererVirtual.loadShuffle(value, selection, false, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.loadSingle.js b/lib/requestHandlers/lib.request.loadSingle.js index eb32a30..3c857c8 100644 --- a/lib/requestHandlers/lib.request.loadSingle.js +++ b/lib/requestHandlers/lib.request.loadSingle.js @@ -19,7 +19,7 @@ module.exports = class Request_LoadSingle extends RequestMediaRenderer { var value = this.getQueryValue("value", ""); - _mediaRendererVirtual.loadSingle(value).then(function(_data){ + _mediaRendererVirtual.loadSingle(value, "", false, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.loadUri.js b/lib/requestHandlers/lib.request.loadUri.js index 97115f4..658c0cb 100644 --- a/lib/requestHandlers/lib.request.loadUri.js +++ b/lib/requestHandlers/lib.request.loadUri.js @@ -19,7 +19,7 @@ module.exports = class Request_LoadUri extends RequestMediaRenderer { var value = this.getQueryValue("value", ""); - _mediaRendererVirtual.loadUri(value).then(function(_data){ + _mediaRendererVirtual.loadUri(value, false, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.mute.js b/lib/requestHandlers/lib.request.mute.js index a147dac..deee929 100644 --- a/lib/requestHandlers/lib.request.mute.js +++ b/lib/requestHandlers/lib.request.mute.js @@ -23,7 +23,7 @@ module.exports = class Request_Mute extends RequestMediaRenderer } else if(_mediaRendererVirtual) { - _mediaRendererVirtual.setMute(value).then(function(_data){ + _mediaRendererVirtual.setMute(value, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); @@ -31,7 +31,7 @@ module.exports = class Request_Mute extends RequestMediaRenderer } else { - _mediaRendererRoom.setMute(value).then(function(_data){ + _mediaRendererRoom.setMute(value, this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); diff --git a/lib/requestHandlers/lib.request.setVolume.js b/lib/requestHandlers/lib.request.setVolume.js index 949e956..de4bb84 100644 --- a/lib/requestHandlers/lib.request.setVolume.js +++ b/lib/requestHandlers/lib.request.setVolume.js @@ -44,7 +44,7 @@ module.exports = class Request_SetVolume extends RequestMediaRenderer var mediaRendererRoom = this.managerDisposer.deviceManager.getMediaRenderer(rendererUdns[rendererIdx]); if(mediaRendererRoom) { - var result = await mediaRendererRoom.setVolume(value * self.volumeMultiplier()); + var result = await mediaRendererRoom.setVolume(value * self.volumeMultiplier(), this.waitTillConfirmed()); resultSum += result; } } @@ -89,7 +89,7 @@ module.exports = class Request_SetVolume extends RequestMediaRenderer if(this.useRelativeValue()) { _mediaRendererVirtual.getVolume().then(function(_volumeNow){ - _mediaRendererVirtual.setVolume(parseInt(_volumeNow) + (parseInt(value) * self.volumeMultiplier())).then(function(_data){ + _mediaRendererVirtual.setVolume(parseInt(_volumeNow) + (parseInt(value) * self.volumeMultiplier()), this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); @@ -100,7 +100,7 @@ module.exports = class Request_SetVolume extends RequestMediaRenderer } else { - _mediaRendererVirtual.setVolume(value * self.volumeMultiplier()).then(function(_data){ + _mediaRendererVirtual.setVolume(value * self.volumeMultiplier(), this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); @@ -112,7 +112,7 @@ module.exports = class Request_SetVolume extends RequestMediaRenderer if(this.useRelativeValue()) { _mediaRendererRoom.getVolume().then(function(_volumeNow){ - _mediaRendererRoom.setVolume(parseInt(_volumeNow) + (parseInt(value) * self.volumeMultiplier())).then(function(_data){ + _mediaRendererRoom.setVolume(parseInt(_volumeNow) + (parseInt(value) * self.volumeMultiplier()), this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data); @@ -123,7 +123,7 @@ module.exports = class Request_SetVolume extends RequestMediaRenderer } else { - _mediaRendererRoom.setVolume(value * self.volumeMultiplier()).then(function(_data){ + _mediaRendererRoom.setVolume(value * self.volumeMultiplier(), this.waitTillConfirmed()).then(function(_data){ _resolve(_data); }).catch(function(_data){ _reject(_data);