Skip to content

Commit

Permalink
#22
Browse files Browse the repository at this point in the history
  • Loading branch information
ChriD committed Apr 23, 2017
1 parent 18e6151 commit 2e971db
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 5 deletions.
9 changes: 9 additions & 0 deletions lib/lib.base.requestMediaRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ module.exports = class RequestMediaRenderer extends Request
{
return true;
}


waitTillConfirmed()
{
var confirm = this.getQueryValue("confirm", "");
if (confirm != "" && confirm != "0" && confirm != "false")
return true;
return false;
}


async run()
Expand Down
2 changes: 1 addition & 1 deletion lib/requestHandlers/lib.request.pause.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = class Request_Pause extends RequestMediaRenderer

runAction(_resolve, _reject, _mediaRendererVirtual, _mediaRendererRoom, _roomUdn)
{
_mediaRendererVirtual.pause().then(function(_data){
_mediaRendererVirtual.pause(this.waitTillConfirmed()).then(function(_data){
_resolve(_data);
}).catch(function(_data){
_reject(_data);
Expand Down
2 changes: 1 addition & 1 deletion lib/requestHandlers/lib.request.play.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = class Request_Play extends RequestMediaRenderer

runAction(_resolve, _reject, _mediaRendererVirtual, _mediaRendererRoom, _roomUdn)
{
_mediaRendererVirtual.play().then(function(_data){
_mediaRendererVirtual.play(this.waitTillConfirmed()).then(function(_data){
_resolve(_data);
}).catch(function(_data){
_reject(_data);
Expand Down
2 changes: 1 addition & 1 deletion lib/requestHandlers/lib.request.setPlayMode.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = class Request_SetPlayMode extends RequestMediaRenderer

}

_mediaRendererVirtual.setPlayMode(playMode).then(function(_data){
_mediaRendererVirtual.setPlayMode(playMode, this.waitTillConfirmed()).then(function(_data){
_resolve(_data);
}).catch(function(_data){
_reject(_data);
Expand Down
2 changes: 1 addition & 1 deletion lib/requestHandlers/lib.request.stop.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module.exports = class Request_Stop extends RequestMediaRenderer

runAction(_resolve, _reject, _mediaRendererVirtual, _mediaRendererRoom, _roomUdn)
{
_mediaRendererVirtual.stop().then(function(_data){
_mediaRendererVirtual.stop(this.waitTillConfirmed()).then(function(_data){
_resolve(_data);
}).catch(function(_data){
_reject(_data);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"engines" : { "node" : ">=7.6.0" },
"name": "node-raumserver",
"version": "0.0.7",
"version": "0.0.8",
"description": "Server to control the Raumfeld multiroom system via requests",
"main": "index.js",
"scripts": {
Expand Down
3 changes: 3 additions & 0 deletions test/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@
<div style="width: 100%; margin-top:15px; ">
node-raumserver host <input id="ip" style="width: 50em; background-color:lightgoldenrodyellow"></input>
</div>
<div style="width: 100%; margin-top:5px; ">
Confirm requests<input id="confirm" type="checkbox"></input>
</div>

<div style="width: 100%; height: 1px; background-color: gray; margin-top:15px; margin-bottom:15px;"></div>

Expand Down
8 changes: 8 additions & 0 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ function doGetAction(_action)

function doAction(_action)
{
if($("#confirm").is(':checked'))
{
if(_action.indexOf("?") > 0)
_action += "&confirm=1"
else
_action += "?confirm=1"
}

showJSONResult({ "val" : "Waiting for response..."});
setUrls();
$.ajax({
Expand Down

0 comments on commit 2e971db

Please sign in to comment.