17 files changed, 65 insertions, 87 deletions
diff --git a/htdocs/CMakeLists.txt b/htdocs/CMakeLists.txt
index 2e51461..c08a493 100644
--- a/htdocs/CMakeLists.txt
+++ b/htdocs/CMakeLists.txt
@@ -23,7 +23,7 @@
 ##################################################
 PROJECT_TARGET_ADD(htdocs)
 
-    file(GLOB SOURCE_FILES "*.html" "*.js" "*.jpg" "*.css")
+    file(GLOB SOURCE_FILES LIST_DIRECTORIES true "*.html" "*.js" "*.jpg" "*.css")
 
     add_input_files("${SOURCE_FILES}")
     
diff --git a/htdocs/assets/content-background-car-wide.png b/htdocs/assets/content-background-car-wide.png
new file mode 100644
index 0000000..073d1b9
--- /dev/null
+++ b/htdocs/assets/content-background-car-wide.png
diff --git a/htdocs/assets/content-background-car.png b/htdocs/assets/content-background-car.png
new file mode 100644
index 0000000..4bcde72
--- /dev/null
+++ b/htdocs/assets/content-background-car.png
diff --git a/htdocs/assets/content-background.png b/htdocs/assets/content-background.png
new file mode 100644
index 0000000..9be581c
--- /dev/null
+++ b/htdocs/assets/content-background.png
diff --git a/htdocs/assets/emergency.png b/htdocs/assets/emergency.png
new file mode 100644
index 0000000..c959b04
--- /dev/null
+++ b/htdocs/assets/emergency.png
diff --git a/htdocs/assets/favicon.ico b/htdocs/assets/favicon.ico
new file mode 100644
index 0000000..eeb7ab7
--- /dev/null
+++ b/htdocs/assets/favicon.ico
diff --git a/htdocs/assets/iot-bzh-logo-small.png b/htdocs/assets/iot-bzh-logo-small.png
new file mode 100644
index 0000000..2c3b2ae
--- /dev/null
+++ b/htdocs/assets/iot-bzh-logo-small.png
diff --git a/htdocs/assets/messages.png b/htdocs/assets/messages.png
new file mode 100644
index 0000000..4919452
--- /dev/null
+++ b/htdocs/assets/messages.png
diff --git a/htdocs/assets/music-pause.png b/htdocs/assets/music-pause.png
new file mode 100644
index 0000000..790a6c4
--- /dev/null
+++ b/htdocs/assets/music-pause.png
diff --git a/htdocs/assets/music-play.png b/htdocs/assets/music-play.png
new file mode 100644
index 0000000..37c18e3
--- /dev/null
+++ b/htdocs/assets/music-play.png
diff --git a/htdocs/assets/phone-call-emit1.png b/htdocs/assets/phone-call-emit1.png
new file mode 100644
index 0000000..a8d863b
--- /dev/null
+++ b/htdocs/assets/phone-call-emit1.png
diff --git a/htdocs/assets/phone-call-emit2.png b/htdocs/assets/phone-call-emit2.png
new file mode 100644
index 0000000..14c8cbe
--- /dev/null
+++ b/htdocs/assets/phone-call-emit2.png
diff --git a/htdocs/assets/phone-call-emit3.png b/htdocs/assets/phone-call-emit3.png
new file mode 100644
index 0000000..5283a40
--- /dev/null
+++ b/htdocs/assets/phone-call-emit3.png
diff --git a/htdocs/assets/phone-call.png b/htdocs/assets/phone-call.png
new file mode 100644
index 0000000..40007d2
--- /dev/null
+++ b/htdocs/assets/phone-call.png
diff --git a/htdocs/audiobackend.html b/htdocs/audiobackend.html
new file mode 100644
index 0000000..a7c8f41
--- /dev/null
+++ b/htdocs/audiobackend.html
@@ -0,0 +1,35 @@
+<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('audiod')">
+    
+    <button id="connected" onclick="init('audiod');">Binder WS Fail</button>   <br><br>
+    <br>
+    <ol>
+    <li><button onclick="callbinder('audiod','play', {device_name:'plug:Entertainment_Main', filepath:'style.wav', loop:0})">play('hw:0', 'style.wav')</button></li>
+    <li><button onclick="callbinder('audiod','play', {device_name:'hw:0', filepath:'application.wav', loop:1})">playloop('hw:0', 'application.wav')</button></li>
+    <li><button onclick="callbinder('audiod','play', {device_name:'hw:0', filepath:'application.wav', loop:0})">play('hw:0', 'application.wav')</button></li>
+    <li><button onclick="callbinder('audiod','stop', {audio_role:4})">stop()</button></li>
+    <li><button onclick="callbinder('audiod','pause', {audio_role:4})">pause()</button></li>
+    <li><button onclick="callbinder('audiod','subscribe', {audio_role:4})">subscribe()</button></li>
+    <li><button onclick="callbinder('audiod','unsubscribe', {audio_role:4})">unsubscribe()</button></li>
+    <li><button onclick="callbinder('audiod','post_event', {event_name:'speed', event_parameter:{speed:10}})">post_event('event_name:speed, {speed:10}')</button></li>
+  
+    </li>
+
+    <br>
+    </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>    
diff --git a/htdocs/audiohl.html b/htdocs/audiohl.html
index 41af265..ec4dd43 100644
--- a/htdocs/audiohl.html
+++ b/htdocs/audiohl.html
@@ -7,103 +7,47 @@
     <script type="text/javascript" src="AudioBinding.js"></script>
 </head>
     
-<body onload="init('audiohl')">
+<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>   
+    <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>
     <select select_id='audiorole_list' onclick='ar=this.value'>
-        <option selected value=''>Select...</option>
-        <option value='warning' >Warning</option>
-        <option value='guidance'>Guidance</option>
-        <option value='notification'>Notification</option>
-        <option value='communication'>Communication</option>
-        <option value='entertainment'>Entertainment</option>
-        <option value='system'>System</option>
-        <option value='startup'>Startup</option>
-        <option value='shutdown'>Shutdown</option>
-    </select>
+        <option value='Warning' >Warning</option>
+        <option value='Guidance'>Guidance</option>
+        <option value='Notification'>Notification</option>
+        <option value='Communication'>Communication</option>
+        <option selected value='Entertainment'>Entertainment</option>
+        <option value='System'>System</option>
+        <option value='Startup'>Startup</option>
+        <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 value=1>Sink</option>
-        <option selected value=''>Select...</option>
-    </select>
-    <b>Endpoint ID</b>
-        <select select_id='endpoint_id_list' onclick='ep_id=this.selectedIndex'>
-        <option value='0'>0</option>
-        <option value='1'>1</option>
-        <option value='2'>2</option>
-        <option value='3'>3</option>
-        <option value='4'>4</option>
-        <option value='5'>5</option>
-        <option value='6'>6</option>
-        <option value='7'>7</option>
-        <option value='8'>8</option>
-        <option value='9'>9</option>
-        <option value='10'>10</option>
-        <option value='11'>11</option>
-        <option value='12'>12</option>
-        <option value='13'>13</option>
-        <option value='14'>14</option>
-        <option value='15'>15</option>
-        <option value='16'>16</option>
-        <option value='17'>17</option>
-        <option value='18'>18</option>
-        <option value='19'>19</option>
-        <option selected value=''>Select...</option>
-    </select>
-    <b>Stream ID</b>
-    <select select_id='stream_id_list' onclick='s_id=this.selectedIndex'>
-        <option value='0'>0</option>
-        <option value='1'>1</option>
-        <option value='2'>2</option>
-        <option value='3'>3</option>
-        <option value='4'>4</option>
-        <option value='5'>5</option>
-        <option value='6'>6</option>
-        <option value='7'>7</option>
-        <option value='8'>8</option>
-        <option value='9'>9</option>
-        <option value='10'>10</option>
-        <option value='11'>11</option>
-        <option value='12'>12</option>
-        <option value='13'>13</option>
-        <option value='14'>14</option>
-        <option value='15'>15</option>
-        <option value='16'>16</option>
-        <option value='17'>17</option>
-        <option value='18'>18</option>
-        <option value='19'>19</option>
-        <option selected value=''>Select...</option>
-    </select>
+        <option selected value=1>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'>
-        <option value='balance'>Balance</option>
+        <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 selected value=''>Select...</option>
-    </select>
-    <b>Volume/Property Value</b>
-        <select select_id='value_list' onclick='val=this.value'>
-        <option value='0'>0</option>
-        <option value='20'>20</option>
-        <option value='40'>40</option>
-        <option value='60'>60</option>
-        <option value='80'>80</option>
-        <option value='100'>100</option>
-        <option selected value=''>Select...</option>
-    </select>
-
+        <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 value='off'>Off</option>
+        <option selected value='off'>Off</option>
         <option value='on'>On</option>
-        <option selected value=''>Select...</option>
-    </select>
-
+    </select><br>
 
     <br>
     <ol>
@@ -119,7 +63,7 @@
     <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:'balance'})">get_property(endpoint_type,endpoint_id,'balance')</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>
diff --git a/htdocs/index.html b/htdocs/index.html
index 3c43f9b..532cfce 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -1,11 +1,10 @@
 <html>
   <head>
-    <title>AGL-AudioBindins tests</title>
+    <title>AGL Audio Agent</title>
   <body>
-    <h1>audio-bindings test</h1>
+    <h1>AAA binding tests</h1>
     <ol>
      <li><a href="alsa-core.html">AlsaCore Low Level Binding</a>
      <li><a href="alsa-hal.html" >AlsaHAL  Hardware Abstraction Layer</a>
-     <li><a href="audio-control.html">AudioControl Control/Policy API</a>
      <li><a href="audiohl.html">High Level Audio API</a>
-     <li><a href="audiohl-demo.html">High Level Audio API Demo</a>
+     <li><a href="audiobackend.html">Audio Backend Test</a>