aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFulup Ar Foll <fulup@iot.bzh>2017-07-25 12:28:21 +0200
committerGitHub <noreply@github.com>2017-07-25 12:28:21 +0200
commitce4eeb376e9fc3d0f3327a34dc7e4a3c0fdfc376 (patch)
treeee2d55374737ac44ea18d315f0871fff1612a358
parent02255317833bcb814f3efc38b65a51c12a7daa66 (diff)
parent04a9940fbcdeb1552a67cc306f2a7a1d6e8ff3eb (diff)
Merge pull request #11 from tjahnk/enable-6ch-volume
Adds volume properties for channel 3..6
-rw-r--r--htdocs/UNICENS.html7
-rw-r--r--ucs2-vol/src/setup.cpp8
2 files changed, 10 insertions, 5 deletions
diff --git a/htdocs/UNICENS.html b/htdocs/UNICENS.html
index 04ad916..73c1b66 100644
--- a/htdocs/UNICENS.html
+++ b/htdocs/UNICENS.html
@@ -13,7 +13,12 @@
<ol>
<li><button onclick="callbinder('UNICENS','initialise', {filename:'data/config_multichannel_audio_kit.xml'})">Parse XML and Start UNICENS</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', {channel:'master', volume: 230})">Set Master Volume to 230</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 215})">Set Master Volume to 215</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', {channel:'master', volume: 185})">Set Master Volume to 185</button></li>
+ <li><button onclick="callbinder('unicens','setvol', {channel:'master', volume: 0})">Set Master Volume to 0</button></li>
+ <br>
<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>
diff --git a/ucs2-vol/src/setup.cpp b/ucs2-vol/src/setup.cpp
index bb54f2f..53b6f8c 100644
--- a/ucs2-vol/src/setup.cpp
+++ b/ucs2-vol/src/setup.cpp
@@ -54,17 +54,17 @@ CSetup::CSetup()
_volume_amp_272_r(0x272U, DEVICE_VAL_RIGHT, LIB_MOST_VOLUME_CH_SUB),
_value_container()
{
- static CDeviceValue* value_list[3] = { &_volume_amp_270_m,
+ static CDeviceValue* value_list[9] = { &_volume_amp_270_m,
&_volume_amp_270_l,
- &_volume_amp_270_r/*,
+ &_volume_amp_270_r,
&_volume_amp_271_m,
&_volume_amp_271_l,
&_volume_amp_271_r,
&_volume_amp_272_m,
&_volume_amp_272_l,
- &_volume_amp_272_r*/};
+ &_volume_amp_272_r};
- _value_container.RegisterValues(value_list, 3U);
+ _value_container.RegisterValues(value_list, 9U);
}
CSetup::~CSetup()