diff options
Diffstat (limited to 'htdocs')
| -rw-r--r-- | htdocs/AFB-websock.js | 6 | ||||
| -rw-r--r-- | htdocs/AudioBinding.js | 24 | ||||
| -rw-r--r-- | htdocs/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | htdocs/UNICENS.html (renamed from htdocs/unicens.html) | 20 | ||||
| -rw-r--r-- | htdocs/index.html | 4 |
5 files changed, 29 insertions, 29 deletions
diff --git a/htdocs/AFB-websock.js b/htdocs/AFB-websock.js index e77ec89..08a7ffe 100644 --- a/htdocs/AFB-websock.js +++ b/htdocs/AFB-websock.js @@ -120,14 +120,14 @@ var AFB_websocket; switch (code) { case RETOK: reply(this.pendings, id, ans, 0); - break; + break; case RETERR: reply(this.pendings, id, ans, 1); - break; + break; case EVENT: default: fire(this.awaitens, id, ans); - break; + break; } } diff --git a/htdocs/AudioBinding.js b/htdocs/AudioBinding.js index e830861..5f9ea24 100644 --- a/htdocs/AudioBinding.js +++ b/htdocs/AudioBinding.js @@ -13,17 +13,17 @@ if (!results[2]) return ''; return decodeURIComponent(results[2].replace(/\+/g, " ")); } - + // default soundcard is "PCH" var devid=getParameterByName("devid"); if (!devid) devid="hw:0"; - + var sndname=getParameterByName("sndname"); if (!sndname) sndname="PCH"; - + var quiet=getParameterByName("quiet"); if (!quiet) quiet="99"; - + function init() { ws = new afb.ws(onopen, onabort); } @@ -34,39 +34,39 @@ document.getElementById("connected").style.background = "lightgreen"; ws.onevent("*", gotevent); } - + function onabort() { document.getElementById("main").style.visibility = "hidden"; document.getElementById("connected").innerHTML = "Connected Closed"; document.getElementById("connected").style.background = "red"; } - + function replyok(obj) { console.log("replyok:" + JSON.stringify(obj)); document.getElementById("output").innerHTML = "OK: "+JSON.stringify(obj); } - + function replyerr(obj) { console.log("replyerr:" + JSON.stringify(obj)); document.getElementById("output").innerHTML = "ERROR: "+JSON.stringify(obj); } - + function gotevent(obj) { console.log("gotevent:" + JSON.stringify(obj)); document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj); } - + function send(message) { var api = document.getElementById("api").value; var verb = document.getElementById("verb").value; document.getElementById("question").innerHTML = "subscribe: "+api+"/"+verb + " (" + JSON.stringify(message) +")"; ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr); } - - + + function callbinder(api, verb, query) { console.log ("subscribe api="+api+" verb="+verb+" query=" +query); document.getElementById("question").innerHTML = "apicall: " + api+"/"+verb +" ("+ JSON.stringify(query)+")"; ws.call(api+"/"+verb, query).then(replyok, replyerr); - }
\ No newline at end of file + } diff --git a/htdocs/CMakeLists.txt b/htdocs/CMakeLists.txt index 01ee523..5bdb47f 100644 --- a/htdocs/CMakeLists.txt +++ b/htdocs/CMakeLists.txt @@ -25,9 +25,9 @@ PROJECT_TARGET_ADD(www_test) file(GLOB SOURCE_FILES "*.html" "*.js" "*.jpg") - add_custom_target(${TARGET_NAME} + add_custom_target(${TARGET_NAME} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_NAME} - ) + ) add_custom_command( DEPENDS ${SOURCE_FILES} diff --git a/htdocs/unicens.html b/htdocs/UNICENS.html index db49baf..089a3f2 100644 --- a/htdocs/unicens.html +++ b/htdocs/UNICENS.html @@ -1,28 +1,28 @@ <html> <head> <title>Hello world test</title> - + <script type="text/javascript" src="AFB-websock.js"></script> <script type="text/javascript" src="AudioBinding.js"></script> - + <body onload="init();"> <h1>Hello world test</h1> <button id="connected" onclick="init()">Binder WS Fail</button></li> <br> <ol> - <li><button onclick="callbinder('unicens','initialise', {filename:'data/ucs2_config/config.ucsx'})">Parse Config.ucsx</button></li> - <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 255})">Set Master Volume to 255</button></li> - <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 200})">Set Master Volume to 200</button></li> - <li><button onclick="callbinder('unicens','setvol', [[0,200], [1,255]])">Set left=200 right=250</button></li> - <li><button onclick="callbinder('unicens','setvol', [[0,255], [1,200]])">Set right=250 left=200</button></li> - <li><button onclick="callbinder('unicens','setvol', [[0,255], [1,255]])">Set right=255 left=255</button></li> + <li><button onclick="callbinder('UNICENS','initialise', {filename:'data/config.ucsx'})">Parse Config.ucsx</button></li> + <li><button onclick="callbinder('UNICENS','setvol', {channel:'master', volume: 255})">Set Master Volume to 255</button></li> + <li><button onclick="callbinder('UNICENS','setvol', {channel:'master', volume: 200})">Set Master Volume to 200</button></li> + <li><button onclick="callbinder('UNICENS','setvol', [[0,200], [1,255]])">Set left=200 right=250</button></li> + <li><button onclick="callbinder('UNICENS','setvol', [[0,255], [1,200]])">Set right=250 left=200</button></li> + <li><button onclick="callbinder('UNICENS','setvol', [[0,255], [1,255]])">Set right=255 left=255</button></li> </ol> - <br> + <br> <div id="main" style="visibility:hidden"> <ol> <li>Question <div id="question"></div> <li>Response <div id="output"></div> <li>Events: <div id="outevt"></div> </ol> - </div> + </div> diff --git a/htdocs/index.html b/htdocs/index.html index 52dc97f..112e0d5 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -2,6 +2,6 @@ <head> <title>AGL-Unicens tests</title> <body> - <h1>unicens-bindings test</h1> + <h1>UNICENS-bindings test</h1> <ol> - <li><a href="unicens.html">Unicens Config</a> + <li><a href="UNICENS.html">UNICENS Config</a> |