From c4c0647af21b2a05e87f36101d86dc2d35f1f47c Mon Sep 17 00:00:00 2001 From: fulup Date: Tue, 5 Jun 2018 00:28:17 +0200 Subject: Update info command and move HTML5 to new API --- conf.d/cmake/00-opensuse-osconfig.cmake | 2 +- conf.d/project/etc/smixer-4a-test-config.json | 35 --- conf.d/project/etc/smixer-test-config.json | 35 +++ conf.d/project/htdocs/index.html | 136 +--------- conf.d/project/lua.d/smixer-test-simple.lua | 253 ++++++++++++++++++ conf.d/project/lua.d/softmixer-simple-test.lua | 253 ------------------ nbproject/configurations.xml | 350 ++++++++++++++++++++++--- plugins/alsa/alsa-api-mixer.c | 126 +++++++-- plugins/alsa/alsa-api-pcm.c | 241 +++++++++++++++-- plugins/alsa/alsa-api-streams.c | 47 ++-- plugins/alsa/alsa-core-pcm.c | 4 +- plugins/alsa/alsa-effect-ramp.c | 2 +- plugins/alsa/alsa-plug-vol.c | 2 +- 13 files changed, 965 insertions(+), 521 deletions(-) delete mode 100644 conf.d/project/etc/smixer-4a-test-config.json create mode 100644 conf.d/project/etc/smixer-test-config.json create mode 100644 conf.d/project/lua.d/smixer-test-simple.lua delete mode 100644 conf.d/project/lua.d/softmixer-simple-test.lua diff --git a/conf.d/cmake/00-opensuse-osconfig.cmake b/conf.d/cmake/00-opensuse-osconfig.cmake index 3da2b4b..b750ece 100644 --- a/conf.d/cmake/00-opensuse-osconfig.cmake +++ b/conf.d/cmake/00-opensuse-osconfig.cmake @@ -1,4 +1,4 @@ message(STATUS "*** Notice: OpenSuSe LUA-5.3+DynApi") list(APPEND PKG_REQUIRED_LIST lua>=5.3) -set(USE_EFENCE 1) +set(USE_EFENCE 0) diff --git a/conf.d/project/etc/smixer-4a-test-config.json b/conf.d/project/etc/smixer-4a-test-config.json deleted file mode 100644 index 6caf228..0000000 --- a/conf.d/project/etc/smixer-4a-test-config.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", - "metadata": { - "uid": "Soft Mixer", - "version": "1.0", - "api": "softmixer", - "info": "Soft Mixer emulating hardware mixer" - }, - "resources": [ - { - "uid": "softmixer", - "info": "Map alsa-loop subdevices to 4A HAL streams", - "spath": "./lib/plugins:./var", - "libs": ["alsa-softmixer.ctlso", "softmixer-simple-test.lua"], - "lua": { - "prefix": "smix", - "functions": ["_mixer_new_"] - } - } - ], - - "onload": [ - { - "uid": "init-soft-mixer", - "info": "Initialise Audio Router", - "action": "lua://softmixer#_mixer_simple_test_" - } - ], - "controls": [ - { - "uid": "create", - "action": "plugin://softmixer#mixer_new" - } - ] -} diff --git a/conf.d/project/etc/smixer-test-config.json b/conf.d/project/etc/smixer-test-config.json new file mode 100644 index 0000000..3ed9f29 --- /dev/null +++ b/conf.d/project/etc/smixer-test-config.json @@ -0,0 +1,35 @@ +{ + "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json", + "metadata": { + "uid": "Soft Mixer", + "version": "1.0", + "api": "smixer", + "info": "Soft Mixer emulating hardware mixer" + }, + "resources": [ + { + "uid": "softmixer", + "info": "Map alsa-loop subdevices to 4A HAL streams", + "spath": "./package/lib/plugins:./package/var:./lib/plugins:./var", + "libs": ["alsa-softmixer.ctlso", "smixer-test-simple.lua"], + "lua": { + "prefix": "smix", + "functions": ["_mixer_new_"] + } + } + ], + + "onload": [ + { + "uid": "init-soft-mixer", + "info": "Initialise Audio Router", + "action": "lua://softmixer#_mixer_simple_test_" + } + ], + "controls": [ + { + "uid": "create", + "action": "plugin://softmixer#mixer_new" + } + ] +} diff --git a/conf.d/project/htdocs/index.html b/conf.d/project/htdocs/index.html index 5709eb2..59fbbac 100644 --- a/conf.d/project/htdocs/index.html +++ b/conf.d/project/htdocs/index.html @@ -5,125 +5,11 @@ - +

Simple Mixer Test

@@ -132,20 +18,18 @@

V3 API CALL

    -
  1. -
    -
  2. -
  3. +
  4. +
  5. +

  6. -
  7. -
  8. +
  9. +

  10. -
  11. -
  12. +
  13. +

  14. -
  15. -
  16. +
  17. +