Add JSON object parameters for policy functions call, fix various bug and code stabilisation

author: Tai Vuong <tvuong@audiokinetic.com> 2017-10-27 21:40:20 -0400
committer: Tai Vuong <tvuong@audiokinetic.com> 2017-10-27 21:40:20 -0400
commit: 8a584f01b46d251fdc5de8b071eff755d99f0090 (patch)
tree: 625bfb4d66933b8fd18428027aa38c8a708368ce /htdocs/audiohl.html
parent: 9b7e1d0361d1a5eee415e453ae79925084552c68 (diff)
1 files changed, 54 insertions, 46 deletions
diff --git a/htdocs/audiohl.html b/htdocs/audiohl.html
index ec4dd43..418cf7a 100644
--- a/htdocs/audiohl.html
+++ b/htdocs/audiohl.html
@@ -1,15 +1,16 @@
 <html>
+
 <head>
     <link rel="stylesheet" href="AudioBinding.css">
     <title>Audio High Level Test</title>
-       
+
     <script type="text/javascript" src="AFB-websock.js"></script>
     <script type="text/javascript" src="AudioBinding.js"></script>
 </head>
-    
-<body onload="init('audiohl'); ep_type=1 ; ar='Entertainment' ; ep_id=0 ; s_id=0 ; val='0' ; p_name='balance' ; st_state=0">
-    
-    <button id="connected" onclick="init('audiohl');">Binder WS Fail</button>   <br><br>
+
+<body onload="init('audiohl'); ep_type='sink' ; ar='Entertainment' ; ep_id=0 ; s_id=0 ; prop_val=0 ; vol_val='0' ; p_name='balance' ; st_state='idle' ; st_mute='off'">
+
+    <button id="connected" onclick="init('audiohl');">Binder WS Fail</button> <br><br>
     <button id="monitoring" onclick="window.open('/monitoring/monitor.html','_monitor_audio')">Debug/Monitoring</a></button>
 
     <b>Audio Role</b>
@@ -24,59 +25,66 @@
         <option value='Shutdown'>Shutdown</option>
     </select><br>
     <b>Endpoint Type</b>
-    <select select_id='endpoint_type_list' onclick='ep_type=this.selectedIndex'>
-        <option value=0>Source</option>
-        <option selected value=1>Sink</option>
+    <select select_id='endpoint_type_list' onclick='ep_type=this.value'>
+        <option value='source'>Source</option>
+        <option selected value='sink'>Sink</option>
     </select><br>
     <b><label for="epidsel">Endpoint ID</label></b>
     <input id="epidsel" type="number" value="0" min=0 step=1 maxlength=4 onchange='ep_id=eval(parseInt(this.value))'><br>
     <b><label for="stidsel">Stream ID</label></b>
     <input id="stidsel" type="number" value="0" min=0 step=1 maxlength=4 onchange='s_id=eval(parseInt(this.value))'><br>
-  <b>Property</b>
-        <select select_id='property_name_list' onclick='p_name=this.value'>
+    <b>Stream State</b>
+    <select select_id='stream_state' onclick='st_state=this.value'>
+        <option selected value='idle'>Idle</option>
+        <option value='running'>Running</option>
+        <option value='paused'>Paused</option>
+    </select><br>
+    <b>Stream Mute State</b>
+    <select select_id='stream_mute' onclick='st_mute=this.value'>
+        <option selected value='off'>Unmuted</option>
+        <option value='on'>Muted</option>
+    </select><br>
+    <b>Property</b>
+    <select select_id='property_name_list' onclick='p_name=this.value'>
         <option selected value='balance'>Balance</option>
         <option value='fade'>Fade</option>
         <option value='eq_bass'>EQ Bass</option>
         <option value='eq_mid'>EQ Mid</option>
-        <option value='eq_treble'>EQ Treble</option>
-        <option value='preset_name'>Preset Name</option>       
-    </select><br>
-    <b><label for="valpropsel">Volume/Property Value</label></b>
-    <input id="valpropsel" type="number" value="0" min=0 max=100 step=1 maxlength=4 onchange='val=this.value'><br>
-    <b>Stream Active/Mute State</b>
-    <select select_id='state_value_list' onclick='st_state=this.selectedIndex'>
-        <option selected value='off'>Off</option>
-        <option value='on'>On</option>
+        <option value='eq_treble'>EQ Treble</option>  
     </select><br>
+    <b><label for="valpropsel">Volume Value</label></b>
+    <input id="volvalsel" type="number" value="0" min=0 max=100 step=1 maxlength=4 onchange='vol_val=this.value'><br>
+    <b><label for="valpropsel">Property Value</label></b>
+    <input id="propvalsel" type="number" value="0" min=0 max=100 step=1 maxlength=4 onchange='prop_val=eval(parseInt(this.value))'><br>
 
     <br>
     <ol>
-    <li><button onclick="callbinder('audiohl','get_sources', {audio_role:ar})">get_sources(audio_role)</button></li>
-    <li><button onclick="callbinder('audiohl','get_sinks', {audio_role:ar})">get_sinks(audio_role)</button></li>
-    <li><button onclick="callbinder('audiohl','stream_open', {audio_role:ar,endpoint_type:ep_type})">stream_open(audio_role,endpoint_type)</button></li>
-    <li><button onclick="callbinder('audiohl','stream_open', {audio_role:ar,endpoint_type:ep_type,endpoint_id:ep_id})">stream_open(audio_role,enpoint_type,endpoint_id)</button></li>
-    <li><button onclick="callbinder('audiohl','stream_close', {stream_id:s_id})">stream_close(stream_id)</button></li>
-    <li><button onclick="callbinder('audiohl','get_stream_info', {stream_id:s_id})">get_stream_info(stream_id)</button></li>
-    <li><button onclick="callbinder('audiohl','set_stream_state', {stream_id:s_id,state:st_state})">set_stream_state(stream_id,stream_state)</button></li>
-    <li><button onclick="callbinder('audiohl','set_stream_mute', {stream_id:s_id,mute:st_state})">set_stream_mute(stream_id,mute)</button></li>
-    <li><button onclick="callbinder('audiohl','set_volume', {endpoint_type:ep_type,endpoint_id:ep_id,volume:val})">set_volume(endpoint_type,endpoint_id,value)</button></li>   
-    <li><button onclick="callbinder('audiohl','get_volume', {endpoint_type:ep_type,endpoint_id:ep_id})">get_volume(endpoint_type,endpoint_id)</button></li>   
-    <li><button onclick="callbinder('audiohl','get_list_properties', {endpoint_type:ep_type,endpoint_id:ep_id})">get_list_properties(endpoint_type,endpoint_id)</button></li>
-    <li><button onclick="callbinder('audiohl','set_property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name,value:val})">set_property(endpoint_type,endpoint_id,property,value)</button></li>    
-    <li><button onclick="callbinder('audiohl','get_property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name})">get_property(endpoint_type,endpoint_id,property)</button></li>   
-    <li><button onclick="callbinder('audiohl','get_list_events', {audio_role:ar})">get_list_events(audio_role)</button></li>
-    <li><button onclick="callbinder('audiohl','post_event', {event_name:'play_sound',audio_role:ar,media_name:'HomeButton.wav'})">post_event(play_sound,audio_role,'HomeButton.wav')</button></li>
-    <li><button onclick="callbinder('audiohl','subscribe', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_event']})">subscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_event'])</button>
-    <li><button onclick="callbinder('audiohl','unsubscribe', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_event']})">unsubscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_event'])</button>
-    </li>
-
-    <br>
+        <li><button onclick="callbinder('audiohl','get_sources', {audio_role:ar})">get_sources(audio_role)</button></li>
+        <li><button onclick="callbinder('audiohl','get_sinks', {audio_role:ar})">get_sinks(audio_role)</button></li>
+        <li><button onclick="callbinder('audiohl','stream_open', {audio_role:ar,endpoint_type:ep_type})">stream_open(audio_role,endpoint_type)</button></li>
+        <li><button onclick="callbinder('audiohl','stream_open', {audio_role:ar,endpoint_type:ep_type,endpoint_id:ep_id})">stream_open(audio_role,enpoint_type,endpoint_id)</button></li>
+        <li><button onclick="callbinder('audiohl','stream_close', {stream_id:s_id})">stream_close(stream_id)</button></li>
+        <li><button onclick="callbinder('audiohl','get_stream_info', {stream_id:s_id})">get_stream_info(stream_id)</button></li>
+        <li><button onclick="callbinder('audiohl','set_stream_state', {stream_id:s_id,state:st_state})">set_stream_state(stream_id,stream_state)</button></li>
+        <li><button onclick="callbinder('audiohl','set_stream_mute', {stream_id:s_id,mute:st_mute})">set_stream_mute(stream_id,mute)</button></li>
+        <li><button onclick="callbinder('audiohl','set_volume', {endpoint_type:ep_type,endpoint_id:ep_id,volume:vol_val})">set_volume(endpoint_type,endpoint_id,value)</button></li>
+        <li><button onclick="callbinder('audiohl','get_volume', {endpoint_type:ep_type,endpoint_id:ep_id})">get_volume(endpoint_type,endpoint_id)</button></li>
+        <li><button onclick="callbinder('audiohl','set_property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name,value:prop_val})">set_property(endpoint_type,endpoint_id,property,value)</button></li>
+        <li><button onclick="callbinder('audiohl','get_property', {endpoint_type:ep_type,endpoint_id:ep_id,property_name:p_name})">get_property(endpoint_type,endpoint_id,property)</button></li>
+        <li><button onclick="callbinder('audiohl','get_endpoint_info', {endpoint_type:ep_type,endpoint_id:ep_id})">get_endpoint_info(endpoint_type,endpoint_id)</button></li>
+        <li><button onclick="callbinder('audiohl','get_list_actions', {audio_role:ar})">get_list_actions(audio_role)</button></li>
+        <li><button onclick="callbinder('audiohl','post_action', {action_name:'emergency_brake',audio_role:ar,media_name:'Warning.wav'})">post_action(emergency_brake,audio_role,'Warning.wav')</button></li>
+        <li><button onclick="callbinder('audiohl','subscribe', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action']})">subscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'])</button>
+        <li><button onclick="callbinder('audiohl','unsubscribe', {events:['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action']})">unsubscribe(['ahl_endpoint_property_event','ahl_endpoint_volume_event','ahl_post_action'])</button></li>
     </ol>
-    
+
     <div id="main" style="visibility:hidden">
-    <ol>
-    <li>Question <pre id="question"></pre>
-    <li>Response <pre id="output"></pre>
-    <li>Events:  <pre id="outevt"></pre>
-    </ol>
-    </div>    
+        <ol>
+            <li>Question
+                <pre id="question"></pre>
+                <li>Response
+                    <pre id="output"></pre>
+                    <li>Events:
+                        <pre id="outevt"></pre>
+        </ol>
+    </div>
+\ No newline at end of file
author	Tai Vuong <tvuong@audiokinetic.com>	2017-10-27 21:40:20 -0400
committer	Tai Vuong <tvuong@audiokinetic.com>	2017-10-27 21:40:20 -0400
commit	8a584f01b46d251fdc5de8b071eff755d99f0090 (patch)
tree	625bfb4d66933b8fd18428027aa38c8a708368ce /htdocs/audiohl.html
parent	9b7e1d0361d1a5eee415e453ae79925084552c68 (diff)