summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nbproject/configurations.xml278
-rw-r--r--plugins/alsa/alsa-api-mixer.c334
-rw-r--r--plugins/alsa/alsa-api-pcm.c5
-rw-r--r--plugins/alsa/alsa-softmixer.h1
4 files changed, 494 insertions, 124 deletions
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 115cebe..7b619f2 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -173,12 +173,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -189,12 +184,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -203,23 +193,11 @@
tool="0"
flavor2="3">
<cTool flags="0">
- <incDir>
- <pElem>/usr/include/json-c</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>/usr/include/p11-kit-1</pElem>
- <pElem>/usr/include/uuid</pElem>
- <pElem>../../../opt/include/alsa</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
- </incDir>
<preprocessorList>
<Elem>AFB_BINDING_VERSION=dyn</Elem>
<Elem>CONTROL_CONFIG_PATH="/home/fulup/Workspace/Audio-4a/4a-softmixer/conf.d/project/etc:/home/fulup/Workspace/Audio-4a/4a-softmixer/build/package/etc:/home/fulup/opt/smixer/etc"</Elem>
<Elem>CONTROL_LUA_PATH="/home/fulup/Workspace/Audio-4a/4a-softmixer/conf.d/project/lua.d:/home/fulup/opt/smixer/var"</Elem>
<Elem>CONTROL_PLUGIN_PATH="/home/fulup/Workspace/Audio-4a/4a-softmixer/build/package/lib/plugins:/home/fulup/opt/smixer/lib/plugins"</Elem>
- <Elem>CONTROL_SUPPORT_LUA</Elem>
<Elem>CTL_PLUGIN_MAGIC=987456123</Elem>
<Elem>USE_API_DYN=1</Elem>
</preprocessorList>
@@ -232,12 +210,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -246,10 +219,6 @@
tool="0"
flavor2="3">
<cTool flags="1">
- <incDir>
- <pElem>app-controller-submodule/ctl-lib</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
- </incDir>
</cTool>
</item>
<item path="app-controller-submodule/ctl-lib/ctl-lua.c"
@@ -259,12 +228,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -275,12 +239,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -291,12 +250,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -307,12 +261,7 @@
<cTool flags="1">
<incDir>
<pElem>../../../opt/include/afb</pElem>
- <pElem>app-controller-submodule/ctl-lib</pElem>
<pElem>/usr/lib64/gcc/x86_64-suse-linux/7/include</pElem>
- <pElem>/usr/include/lua5.3</pElem>
- <pElem>app-afb-helpers-submodule</pElem>
- <pElem>../../../opt/include</pElem>
- <pElem>build/app-controller-submodule/ctl-lib</pElem>
</incDir>
</cTool>
</item>
@@ -382,6 +331,18 @@
<item path="plugins/alsa/alsa-api-loop.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -392,7 +353,16 @@
<item path="plugins/alsa/alsa-api-mixer.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
</incDir>
<preprocessorList>
<Elem>alsa_softmixer_EXPORTS</Elem>
@@ -402,6 +372,18 @@
<item path="plugins/alsa/alsa-api-pcm.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -412,6 +394,18 @@
<item path="plugins/alsa/alsa-api-ramp.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -422,6 +416,18 @@
<item path="plugins/alsa/alsa-api-sink.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -432,6 +438,18 @@
<item path="plugins/alsa/alsa-api-source.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -442,6 +460,18 @@
<item path="plugins/alsa/alsa-api-streams.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -452,6 +482,18 @@
<item path="plugins/alsa/alsa-api-zones.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -461,6 +503,20 @@
</item>
<item path="plugins/alsa/alsa-capture.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
+ <incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
+ </incDir>
<preprocessorList>
<Elem>CONTROL_CONFIG_PATH="/home/fulup/opt/4a-softmixer/etc:/home/fulup/Workspace/Audio-4a/4a-softmixer/build/package/etc"</Elem>
<Elem>CONTROL_LUA_PATH="/home/fulup/opt/4a-softmixer/data:/home/fulup/Workspace/Audio-4a/4a-softmixer/conf.d/project/lua.d"</Elem>
@@ -472,6 +528,18 @@
<item path="plugins/alsa/alsa-core-ctl.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -482,6 +550,18 @@
<item path="plugins/alsa/alsa-core-pcm.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -492,6 +572,18 @@
<item path="plugins/alsa/alsa-effect-ramp.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -502,6 +594,18 @@
<item path="plugins/alsa/alsa-plug-dmix.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -512,6 +616,18 @@
<item path="plugins/alsa/alsa-plug-rate.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -522,6 +638,18 @@
<item path="plugins/alsa/alsa-plug-route.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -532,6 +660,18 @@
<item path="plugins/alsa/alsa-plug-vol.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -542,6 +682,18 @@
<item path="plugins/alsa/alsa-softmixer.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -552,6 +704,18 @@
<item path="plugins/alsa/alsa-utils-bypath.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
@@ -562,6 +726,18 @@
<item path="plugins/alsa/alsa-utils-dump.c" ex="false" tool="0" flavor2="2">
<cTool flags="0">
<incDir>
+ <pElem>app-controller-submodule/ctl-lib</pElem>
+ <pElem>build/app-controller-submodule/ctl-lib</pElem>
+ <pElem>/usr/include</pElem>
+ <pElem>/usr/include/json-c</pElem>
+ <pElem>/usr/include/alsa</pElem>
+ <pElem>../../../opt/include</pElem>
+ <pElem>/usr/include/p11-kit-1</pElem>
+ <pElem>/usr/include/uuid</pElem>
+ <pElem>../../../opt/include/alsa</pElem>
+ <pElem>mixer-binding</pElem>
+ <pElem>app-afb-helpers-submodule</pElem>
+ <pElem>build/plugins/alsa</pElem>
<pElem>/usr/include/lua5.3</pElem>
</incDir>
<preprocessorList>
diff --git a/plugins/alsa/alsa-api-mixer.c b/plugins/alsa/alsa-api-mixer.c
index 645fa8d..23fdfb5 100644
--- a/plugins/alsa/alsa-api-mixer.c
+++ b/plugins/alsa/alsa-api-mixer.c
@@ -75,7 +75,7 @@ STATIC json_object *MixerInfoOneStream(AlsaStreamAudioT *stream, int verbose) {
if (!verbose) {
- wrap_json_pack(&responseJ, "{ss, ss}", "uid", stream->uid, "alsa", stream->source);
+ wrap_json_pack(&responseJ, "{ss, ss, ss}", "uid", stream->uid, "verb", stream->verb, "alsa", stream->source);
} else {
wrap_json_pack(&alsaJ, "{ss,si,si}"
@@ -228,7 +228,6 @@ STATIC json_object *MixerInfoRamps(SoftMixerT *mixer, json_object *rampsJ, int v
AFB_ApiError(mixer->api, "MixerInfoRamps: fail to find ramp=%s", json_object_get_string(rampsJ));
goto OnErrorExit;
}
- AFB_ApiNotice(mixer->api, "MixerInfoRamps: valueJ=%s", json_object_get_string(valueJ));
json_object_array_add(responseJ, valueJ);
}
break;
@@ -238,27 +237,251 @@ STATIC json_object *MixerInfoRamps(SoftMixerT *mixer, json_object *rampsJ, int v
goto OnErrorExit;
}
- AFB_ApiNotice(mixer->api, "MixerInfoRamps: response=%s", json_object_get_string(responseJ));
return (responseJ);
OnErrorExit:
return NULL;
+}
+
+STATIC json_object *MixerInfoOneZone(AlsaSndZoneT *zone, int verbose) {
+ json_object *responseJ;
+
+ if (!verbose) {
+ wrap_json_pack(&responseJ, "{ss}", "uid", zone->uid);
+ } else {
+ json_object *responseJ = json_object_new_object();
+ if (zone->sinks) {
+ json_object *sinksJ = json_object_new_array();
+ for (int jdx = 0; zone->sinks[jdx]; jdx++) {
+ json_object *channelJ;
+ wrap_json_pack(&channelJ, "{ss,si}"
+ , "uid", zone->sinks[jdx]->uid
+ , "port", zone->sinks[jdx]->port
+ );
+ json_object_array_add(sinksJ, channelJ);
+ }
+ json_object_object_add(responseJ, "sinks", sinksJ);
+ }
+
+ if (zone->sources) {
+ json_object *sourcesJ = json_object_new_array();
+ for (int jdx = 0; zone->sources[jdx]; jdx++) {
+ json_object *channelJ;
+ wrap_json_pack(&channelJ, "{ss,si}"
+ , "uid", zone->sources[jdx]->uid
+ , "port", zone->sources[jdx]->port
+ );
+ json_object_array_add(sourcesJ, channelJ);
+ }
+ json_object_object_add(responseJ, "source", sourcesJ);
+ }
+
+ if (zone->params) {
+ json_object *paramsJ;
+ wrap_json_pack(&paramsJ, "{si,ss,si}"
+ , "rate", zone->params->rate
+ , "format", zone->params->formatS
+ , "channels", zone->params->channels
+ );
+ json_object_object_add(responseJ, "params", paramsJ);
+ }
+ }
+ return (responseJ);
+}
+
+STATIC json_object *MixerInfoZones(SoftMixerT *mixer, json_object *zonesJ, int verbose) {
+ int error;
+ const char * key;
+ json_object *valueJ;
+ json_object *responseJ = NULL;
+ AlsaSndZoneT **zones = mixer->zones;
+
+ switch (json_object_get_type(zonesJ)) {
+
+ case json_type_null:
+ case json_type_boolean:
+ // list every existing zone
+ responseJ = json_object_new_array();
+ for (int idx = 0; zones[idx]; idx++) {
+
+ valueJ = MixerInfoOneZone(zones[idx], verbose);
+ json_object_array_add(responseJ, valueJ);
+ }
+ break;
+
+ case json_type_string:
+ key = json_object_get_string(zonesJ);
+ for (int idx = 0; zones[idx]; idx++) {
+ if (strcasecmp(zones[idx]->uid, key)) continue;
+ responseJ = MixerInfoOneZone(zones[idx], verbose);
+ break;
+ }
+ break;
+
+ case json_type_object:
+ error = wrap_json_unpack(zonesJ, "{ss}", "uid", &key);
+ if (error) {
+ AFB_ApiError(mixer->api, "MixerInfoZones: missing 'uid' request zoneJ=%s error=%s position=%d", json_object_get_string(zonesJ), wrap_json_get_error_string(error), wrap_json_get_error_position(error));
+ goto OnErrorExit;
+ }
+ for (int idx = 0; zones[idx]; idx++) {
+ if (strcasecmp(zones[idx]->uid, key)) continue;
+ responseJ = MixerInfoOneZone(zones[idx], verbose);
+ break;
+ }
+ break;
+
+ case json_type_array:
+ responseJ = json_object_new_array();
+ for (int idx = 0; idx < json_object_array_length(zonesJ); idx++) {
+ json_object *zoneJ = json_object_array_get_idx(zonesJ, idx);
+
+ valueJ = MixerInfoZones(mixer, zoneJ, verbose);
+ if (!valueJ) {
+ AFB_ApiError(mixer->api, "MixerInfoZones: fail to find zone=%s", json_object_get_string(zonesJ));
+ goto OnErrorExit;
+ }
+ json_object_array_add(responseJ, valueJ);
+ }
+ break;
+
+ default:
+ AFB_ApiError(mixer->api, "MixerInfoZones: unsupported json type zonesJ=%s", json_object_get_string(zonesJ));
+ goto OnErrorExit;
+ }
+
+ AFB_ApiNotice(mixer->api, "MixerInfoZones: response=%s", json_object_get_string(responseJ));
+ return (responseJ);
+
+OnErrorExit:
+ return NULL;
+}
+
+STATIC json_object *MixerInfoOnePcm(AlsaSndPcmT *pcm, int verbose) {
+ json_object *responseJ;
+
+ if (!verbose) {
+ wrap_json_pack(&responseJ, "{ss,ss}", "uid", pcm->uid, "verb", pcm->verb);
+ } else {
+ json_object *sndcardJ, *alsaJ;
+ wrap_json_pack(&sndcardJ, "{ss,si,si,si}"
+ ,"cardid", pcm->sndcard->cid.cardid
+ ,"name", pcm->sndcard->cid.name
+ ,"longname", pcm->sndcard->cid.longname
+ ,"index", pcm->sndcard->cid.cardidx
+ ,"device", pcm->sndcard->cid.device
+ ,"subdev", pcm->sndcard->cid.subdev
+ );
+ wrap_json_pack(&alsaJ, "{ss,ss,so}"
+ , "volume", pcm->volume
+ , "mute", pcm->mute
+ , "ccount", pcm->ccount
+ );
+ wrap_json_pack(&responseJ, "{ss,ss,so,so}"
+ , "uid", pcm->uid
+ , "verb", pcm->verb
+ , "sndcard", sndcardJ
+ , "alsa", alsaJ
+ );
+ }
+ return (responseJ);
+}
+
+STATIC json_object *MixerInfoPcms(SoftMixerT *mixer, json_object *pcmsJ, snd_pcm_stream_t direction, int verbose) {
+ int error;
+ const char * key;
+ json_object *valueJ;
+ json_object *responseJ = NULL;
+ AlsaSndPcmT **pcms;
+
+ switch (direction) {
+
+ case SND_PCM_STREAM_PLAYBACK:
+ pcms = mixer->sinks;
+ break;
+
+ case SND_PCM_STREAM_CAPTURE:
+ pcms = mixer->sources;
+ break;
+ default:
+ AFB_ApiError(mixer->api, "MixerInfoPcms: invalid Direction should be SND_PCM_STREAM_PLAYBACK|SND_PCM_STREAM_capture");
+ goto OnErrorExit;
+ }
+
+
+ switch (json_object_get_type(pcmsJ)) {
+
+ case json_type_null:
+ case json_type_boolean:
+ // list every existing pcm
+ responseJ = json_object_new_array();
+ for (int idx = 0; pcms[idx]; idx++) {
+
+ valueJ = MixerInfoOnePcm(pcms[idx], verbose);
+ json_object_array_add(responseJ, valueJ);
+ }
+ break;
+
+ case json_type_string:
+ key = json_object_get_string(pcmsJ);
+ for (int idx = 0; pcms[idx]; idx++) {
+ if (strcasecmp(pcms[idx]->uid, key)) continue;
+ responseJ = MixerInfoOnePcm(pcms[idx], verbose);
+ break;
+ }
+ break;
+
+ case json_type_object:
+ error = wrap_json_unpack(pcmsJ, "{ss}", "uid", &key);
+ if (error) {
+ AFB_ApiError(mixer->api, "MixerInfoPcms: missing 'uid' request pcmJ=%s error=%s position=%d", json_object_get_string(pcmsJ), wrap_json_get_error_string(error), wrap_json_get_error_position(error));
+ goto OnErrorExit;
+ }
+ for (int idx = 0; pcms[idx]; idx++) {
+ if (strcasecmp(pcms[idx]->uid, key)) continue;
+ responseJ = MixerInfoOnePcm(pcms[idx], verbose);
+ break;
+ }
+ break;
+
+ case json_type_array:
+ responseJ = json_object_new_array();
+ for (int idx = 0; idx < json_object_array_length(pcmsJ); idx++) {
+ json_object *pcmJ = json_object_array_get_idx(pcmsJ, idx);
+
+ valueJ = MixerInfoPcms(mixer, pcmJ, direction, verbose);
+ if (!valueJ) {
+ AFB_ApiError(mixer->api, "MixerInfoPcms: fail to find playback=%s", json_object_get_string(pcmsJ));
+ goto OnErrorExit;
+ }
+ json_object_array_add(responseJ, valueJ);
+ }
+ break;
+
+ default:
+ AFB_ApiError(mixer->api, "MixerInfoPcms: unsupported json type pcmsJ=%s", json_object_get_string(pcmsJ));
+ goto OnErrorExit;
+ }
+
+ return (responseJ);
+OnErrorExit:
+ return NULL;
}
STATIC void MixerInfoAction(AFB_ReqT request, json_object * argsJ) {
SoftMixerT *mixer = (SoftMixerT*) afb_request_get_vcbdata(request);
- int error, verbose = 0, zones = 0, captures = 0, playbacks = 0;
- json_object *streamsJ = NULL, *rampsJ = NULL;
+ int error, verbose = 0;
+ json_object *streamsJ = NULL, *rampsJ = NULL, *zonesJ = NULL, *capturesJ = NULL, *playbacksJ = NULL;
- error = wrap_json_unpack(argsJ, "{s?b,s?o,s?o,s?b,s?b,s?b !}"
+ error = wrap_json_unpack(argsJ, "{s?b,s?o,s?o,s?o,s?o,s?o !}"
, "verbose", &verbose
, "streams", &streamsJ
, "ramps", &rampsJ
- , "captures", &captures
- , "playbacks", &playbacks
- , "zones", &zones
+ , "captures", &capturesJ
+ , "playbacks", &playbacksJ
+ , "zones", &zonesJ
);
if (error) {
AFB_ReqFailF(request, "invalid-syntax", "list missing 'quiet|stream|backend|source' argsJ=%s", json_object_get_string(argsJ));
@@ -266,7 +489,7 @@ STATIC void MixerInfoAction(AFB_ReqT request, json_object * argsJ) {
}
json_object *responseJ = json_object_new_object();
-
+
if (streamsJ) {
json_object *resultJ = MixerInfoStreams(mixer, streamsJ, verbose);
if (!resultJ) {
@@ -281,62 +504,22 @@ STATIC void MixerInfoAction(AFB_ReqT request, json_object * argsJ) {
json_object_object_add(responseJ, "ramps", resultJ);
}
- if (zones) {
- json_object *zonesJ = json_object_new_array();
-
- AlsaSndZoneT **zones = mixer->zones;
- for (int idx = 0; zones[idx]; idx++) {
- if (!verbose) {
- json_object_array_add(zonesJ, json_object_new_string(zones[idx]->uid));
- } else {
- json_object *zoneJ = json_object_new_object();
- if (zones[idx]->sinks) {
- json_object *sinksJ = json_object_new_array();
- for (int jdx = 0; zones[idx]->sinks[jdx]; jdx++) {
- json_object *channelJ;
- wrap_json_pack(&channelJ, "{ss,si}"
- , "uid", zones[idx]->sinks[jdx]->uid
- , "port", zones[idx]->sinks[jdx]->port
- );
- json_object_array_add(sinksJ, channelJ);
- }
- json_object_object_add(zoneJ, "sinks", sinksJ);
- }
-
- if (zones[idx]->sources) {
- json_object *sourcesJ = json_object_new_array();
- for (int jdx = 0; zones[idx]->sources[jdx]; jdx++) {
- json_object *channelJ;
- wrap_json_pack(&channelJ, "{ss,si}"
- , "uid", zones[idx]->sources[jdx]->uid
- , "port", zones[idx]->sources[jdx]->port
- );
- json_object_array_add(sourcesJ, channelJ);
- }
- json_object_object_add(zoneJ, "source", sourcesJ);
- }
-
- if (zones[idx]->params) {
+ if (zonesJ) {
+ json_object *resultJ = MixerInfoZones(mixer, zonesJ, verbose);
+ json_object_object_add(responseJ, "zones", resultJ);
+ }
- json_object *paramsJ;
- wrap_json_pack(&paramsJ, "{si,ss,si}"
- , "rate", zones[idx]->params->rate
- , "format", zones[idx]->params->formatS
- , "channels", zones[idx]->params->channels
- );
- json_object_object_add(zoneJ, "params", paramsJ);
- }
- json_object_array_add(zonesJ, zoneJ);
- }
- }
- json_object_object_add(responseJ, "zones", zonesJ);
+ if (playbacksJ) {
+ json_object *resultJ = MixerInfoPcms(mixer, playbacksJ, SND_PCM_STREAM_PLAYBACK, verbose);
+ json_object_object_add(responseJ, "playbacks", resultJ);
}
- if (captures || playbacks) {
- AFB_ReqFailF(request, "not implemented", "(Fulup) list action Still To Be Done");
- goto OnErrorExit;
+ if (capturesJ) {
+ json_object *resultJ = MixerInfoPcms(mixer, capturesJ, SND_PCM_STREAM_CAPTURE, verbose);
+ json_object_object_add(responseJ, "captures", resultJ);
}
+
AFB_ReqSuccess(request, responseJ, NULL);
return;
@@ -352,7 +535,7 @@ STATIC void MixerInfoVerb(AFB_ReqT request) {
STATIC void MixerAttachVerb(AFB_ReqT request) {
SoftMixerT *mixer = (SoftMixerT*) afb_request_get_vcbdata(request);
const char *uid = NULL, *prefix = NULL;
- json_object *playbackJ = NULL, *captureJ = NULL, *zonesJ = NULL, *streamsJ = NULL, *rampsJ = NULL, *loopsJ = NULL;
+ json_object *playbacksJ = NULL, *capturesJ = NULL, *zonesJ = NULL, *streamsJ = NULL, *rampsJ = NULL, *loopsJ = NULL;
json_object *argsJ = afb_request_json(request);
json_object *responseJ = json_object_new_object();
int error;
@@ -361,8 +544,8 @@ STATIC void MixerAttachVerb(AFB_ReqT request) {
, "uid", &uid
, "prefix", &prefix
, "ramps", &rampsJ
- , "playbacks", &playbackJ
- , "captures", &captureJ
+ , "playbacks", &playbacksJ
+ , "captures", &capturesJ
, "loops", &loopsJ
, "zones", &zonesJ
, "streams", &streamsJ
@@ -372,24 +555,33 @@ STATIC void MixerAttachVerb(AFB_ReqT request) {
goto OnErrorExit;
}
- if (playbackJ) {
- error = ApiSinkAttach(mixer, request, uid, playbackJ);
+ if (loopsJ) {
+ error = ApiLoopAttach(mixer, request, uid, loopsJ);
if (error) goto OnErrorExit;
}
-
- if (captureJ) {
- error = ApiSourceAttach(mixer, request, uid, captureJ);
+
+ if (playbacksJ) {
+ error = ApiSinkAttach(mixer, request, uid, playbacksJ);
if (error) goto OnErrorExit;
+
+ json_object *resultJ = MixerInfoPcms(mixer, playbacksJ, SND_PCM_STREAM_PLAYBACK, 0);
+ json_object_object_add(responseJ, "playbacks", resultJ);
}
- if (loopsJ) {
- error = ApiLoopAttach(mixer, request, uid, loopsJ);
+ if (capturesJ) {
+ error = ApiSourceAttach(mixer, request, uid, capturesJ);
if (error) goto OnErrorExit;
+
+ json_object *resultJ = MixerInfoPcms(mixer, capturesJ, SND_PCM_STREAM_CAPTURE, 0);
+ json_object_object_add(responseJ, "captures", resultJ);
}
if (zonesJ) {
error = ApiZoneAttach(mixer, request, uid, zonesJ);
if (error) goto OnErrorExit;
+
+ json_object *resultJ = MixerInfoZones(mixer, zonesJ, 0);
+ json_object_object_add(responseJ, "zone", resultJ);
}
if (rampsJ) {
diff --git a/plugins/alsa/alsa-api-pcm.c b/plugins/alsa/alsa-api-pcm.c
index 64b852e..6560271 100644
--- a/plugins/alsa/alsa-api-pcm.c
+++ b/plugins/alsa/alsa-api-pcm.c
@@ -525,12 +525,13 @@ PUBLIC AlsaSndPcmT * ApiPcmAttachOne(SoftMixerT *mixer, const char *uid, snd_pcm
} else {
(void) asprintf(&apiVerb, "%s:capture", pcm->uid);
(void) asprintf(&apiInfo, "HAL:%s SND_PCM_STREAM_PLAYBACK", uid);
- }
+ }
+
apiVerbHandleT *handle = calloc(1, sizeof (apiVerbHandleT));
handle->uid = uid;
handle->pcm = pcm;
handle->mixer = mixer;
-
+ pcm->verb=apiVerb;
error = afb_dynapi_add_verb(mixer->api, apiVerb, apiInfo, ApiPcmVerbCB, handle, NULL, 0);
if (error) {
AFB_ApiError(mixer->api, "ApiPcmAttachOne mixer=%s verb=%s fail to Register Master control ", mixer->uid, apiVerb);
diff --git a/plugins/alsa/alsa-softmixer.h b/plugins/alsa/alsa-softmixer.h
index 77d9982..3a3cf05 100644
--- a/plugins/alsa/alsa-softmixer.h
+++ b/plugins/alsa/alsa-softmixer.h
@@ -164,6 +164,7 @@ typedef struct {
typedef struct {
const char *uid;
+ const char *verb;
unsigned int ccount;
AlsaSndCtlT *sndcard;
AlsaSndControlT volume;