From f5be7b35a837f0d4789ac59f8ad5a11293e29498 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 15 Dec 2021 22:46:23 +0100 Subject: [PATCH] [DEV] integrate GLD --- .gitignore | 5 ++ ...seSubFolders.txt => GLDParseSubFolders.txt | 0 GLD_audio-river-test.json | 34 ++++++++++ GLD_audio-river.json | 58 ++++++++++++++++ lutin_audio-river-test.py | 48 -------------- lutin_audio-river.py | 66 ------------------- sample/ioViewer/GLD_ioViewer.json | 31 +++++++++ sample/ioViewer/lutin_ioViewer.py | 39 ----------- sample/read/GLD_river-sample-read.json | 24 +++++++ sample/read/lutin_river-sample-read.py | 45 ------------- sample/write/GLD_river-sample-write.json | 24 +++++++ sample/write/lutin_river-sample-write.py | 45 ------------- widget/GLD_audio-river-widget.json | 29 ++++++++ widget/lutin_audio-river-widget.py | 43 ------------ 14 files changed, 205 insertions(+), 286 deletions(-) rename lutinParseSubFolders.txt => GLDParseSubFolders.txt (100%) create mode 100644 GLD_audio-river-test.json create mode 100644 GLD_audio-river.json delete mode 100644 lutin_audio-river-test.py delete mode 100644 lutin_audio-river.py create mode 100644 sample/ioViewer/GLD_ioViewer.json delete mode 100644 sample/ioViewer/lutin_ioViewer.py create mode 100644 sample/read/GLD_river-sample-read.json delete mode 100644 sample/read/lutin_river-sample-read.py create mode 100644 sample/write/GLD_river-sample-write.json delete mode 100644 sample/write/lutin_river-sample-write.py create mode 100644 widget/GLD_audio-river-widget.json delete mode 100644 widget/lutin_audio-river-widget.py diff --git a/.gitignore b/.gitignore index e978887..a120112 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +__pycache__ +.bck +out +target +build ################################### # backup files ################################### diff --git a/lutinParseSubFolders.txt b/GLDParseSubFolders.txt similarity index 100% rename from lutinParseSubFolders.txt rename to GLDParseSubFolders.txt diff --git a/GLD_audio-river-test.json b/GLD_audio-river-test.json new file mode 100644 index 0000000..b38dc57 --- /dev/null +++ b/GLD_audio-river-test.json @@ -0,0 +1,34 @@ +{ + "type":"BINARY", + "sub-type":"TEST", + "group-id":"com.atria-soft", + "description":"Multi-nodal audio interface test", + "license":"MPL-2", + "license-file":"file://LICENSE", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "code-quality":"MEDIUM", + + "source": [ + "test/main.cpp", + "test/testAEC.cpp", + "test/testEchoDelay.cpp", + "test/testFormat.cpp", + "test/testMuxer.cpp", + "test/testPlaybackCallback.cpp", + "test/testPlaybackWrite.cpp", + "test/testRecordCallback.cpp", + "test/testRecordRead.cpp", + "test/testVolume.cpp" + ], + "compilation-version": { + "c++": 2017 + }, + "dependency": [ + "audio-river", + "etest", + "etk", + "test-debug" + ] +} \ No newline at end of file diff --git a/GLD_audio-river.json b/GLD_audio-river.json new file mode 100644 index 0000000..2c1e6e4 --- /dev/null +++ b/GLD_audio-river.json @@ -0,0 +1,58 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"Multi-nodal audio interface", + "license":"MPL-2", + "license-file":"file://LICENSE", + "maintainer":"file://authors.txt", + "author":"file://authors.txt", + "version":"file://version.txt", + "code-quality":"MEDIUM", + + "source": [ + "audio/river/debug.cpp", + "audio/river/river.cpp", + "audio/river/Manager.cpp", + "audio/river/Interface.cpp", + "audio/river/io/Group.cpp", + "audio/river/io/Node.cpp", + "audio/river/io/NodeOrchestra.cpp", + "audio/river/io/NodePortAudio.cpp", + "audio/river/io/NodeAEC.cpp", + "audio/river/io/NodeMuxer.cpp", + "audio/river/io/Manager.cpp" + ], + "header": [ + "audio/river/river.hpp", + "audio/river/Manager.hpp", + "audio/river/Interface.hpp", + "audio/river/io/Group.hpp", + "audio/river/io/Node.hpp", + "audio/river/io/Manager.hpp" + ], + "path":[ + "." + ], + "compilation-version": { + "c++": 2017 + }, + "dependency": [ + "audio", + "audio-drain", + "ejson",{ + "name": "audio-orchestra", + "optional": true, + "export": true, + "flag": { + "c++": "-DAUDIO_RIVER_BUILD_ORCHESTRA" + } + },{ + "name": "portaudio", + "optional": true, + "export": true, + "flag": { + "c++": "-DAUDIO_RIVER_BUILD_PORTAUDIO" + } + } + ] +} \ No newline at end of file diff --git a/lutin_audio-river-test.py b/lutin_audio-river-test.py deleted file mode 100644 index ed09bc6..0000000 --- a/lutin_audio-river-test.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "TEST" - -def get_desc(): - return "Multi-nodal audio interface test" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def configure(target, my_module): - my_module.add_src_file([ - 'test/main.cpp', - 'test/testAEC.cpp', - 'test/testEchoDelay.cpp', - 'test/testFormat.cpp', - 'test/testMuxer.cpp', - 'test/testPlaybackCallback.cpp', - 'test/testPlaybackWrite.cpp', - 'test/testRecordCallback.cpp', - 'test/testRecordRead.cpp', - 'test/testVolume.cpp', - ]) - my_module.add_depend([ - 'audio-river', - 'etest', - 'etk', - 'test-debug' - ]) - return True - - diff --git a/lutin_audio-river.py b/lutin_audio-river.py deleted file mode 100644 index be6a903..0000000 --- a/lutin_audio-river.py +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "Multi-nodal audio interface" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return "authors.txt" - -def get_version(): - return "version.txt" - -def configure(target, my_module): - my_module.add_src_file([ - 'audio/river/debug.cpp', - 'audio/river/river.cpp', - 'audio/river/Manager.cpp', - 'audio/river/Interface.cpp', - 'audio/river/io/Group.cpp', - 'audio/river/io/Node.cpp', - 'audio/river/io/NodeOrchestra.cpp', - 'audio/river/io/NodePortAudio.cpp', - 'audio/river/io/NodeAEC.cpp', - 'audio/river/io/NodeMuxer.cpp', - 'audio/river/io/Manager.cpp' - ]) - my_module.add_header_file([ - 'audio/river/river.hpp', - 'audio/river/Manager.hpp', - 'audio/river/Interface.hpp', - 'audio/river/io/Group.hpp', - 'audio/river/io/Node.hpp', - 'audio/river/io/Manager.hpp' - ]) - my_module.add_optionnal_depend('audio-orchestra', ["c++", "-DAUDIO_RIVER_BUILD_ORCHESTRA"]) - my_module.add_optionnal_depend('portaudio', ["c++", "-DAUDIO_RIVER_BUILD_PORTAUDIO"]) - my_module.add_depend([ - 'audio', - 'audio-drain', - 'ejson' - ]) - my_module.add_path(".") - return True - - - - - - - - - diff --git a/sample/ioViewer/GLD_ioViewer.json b/sample/ioViewer/GLD_ioViewer.json new file mode 100644 index 0000000..370a7e7 --- /dev/null +++ b/sample/ioViewer/GLD_ioViewer.json @@ -0,0 +1,31 @@ +{ + "type":"BINARY", + "sub-type":"TEST", + "group-id":"com.atria-soft", + "description":"Simpleaudio IO viewer and test ...", + "license":"MPL-2", + "license-file":"file://../../LICENSE", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "appl/debug.cpp", + "appl/main.cpp", + "appl/Windows.cpp" + ], + "compilation-version": { + "c++": 2017 + }, + "path": [ + "." + ], + "dependency": [ + "ewol", + "audio-river", + "audio-river-widget" + ], + "comment": "# set the package properties \n my_module.set_pkg(SECTION, [Development]) \n my_module.set_pkg(PRIORITY, optional) \n my_module.add_pkg(RIGHT, RECORD_AUDIO)" +} + diff --git a/sample/ioViewer/lutin_ioViewer.py b/sample/ioViewer/lutin_ioViewer.py deleted file mode 100644 index 9cfdf4b..0000000 --- a/sample/ioViewer/lutin_ioViewer.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools -import os - - -def get_type(): - return "BINARY" - -def get_desc(): - return "Simpleaudio IO viewer and test ..." - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - my_module.add_extra_flags() - my_module.add_src_file([ - 'appl/debug.cpp', - 'appl/main.cpp', - 'appl/Windows.cpp']) - my_module.add_depend(['ewol', 'audio-river', 'audio-river-widget']) - my_module.add_path(".") - # set the package properties : - my_module.set_pkg("SECTION", ["Development"]) - my_module.set_pkg("PRIORITY", "optional") - - my_module.add_pkg("RIGHT", "RECORD_AUDIO") - return True - diff --git a/sample/read/GLD_river-sample-read.json b/sample/read/GLD_river-sample-read.json new file mode 100644 index 0000000..8b798d1 --- /dev/null +++ b/sample/read/GLD_river-sample-read.json @@ -0,0 +1,24 @@ +{ + "type":"BINARY", + "sub-type":"TEST", + "group-id":"com.atria-soft", + "description":"Read some data", + "license":"MPL-2", + "license-file":"file://../../LICENSE", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "read.cpp" + ], + "compilation-version": { + "c++": 2017 + }, + "dependency": [ + "audio-river", + "test-debug", + "etk" + ] +} \ No newline at end of file diff --git a/sample/read/lutin_river-sample-read.py b/sample/read/lutin_river-sample-read.py deleted file mode 100644 index ad0e9a2..0000000 --- a/sample/read/lutin_river-sample-read.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_desc(): - return "Read some data" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - my_module.add_src_file([ - 'read.cpp', - ]) - my_module.add_depend([ - 'audio-river', - 'test-debug', - 'etk' - ]) - return True - - - - - - - - - diff --git a/sample/write/GLD_river-sample-write.json b/sample/write/GLD_river-sample-write.json new file mode 100644 index 0000000..dc5f337 --- /dev/null +++ b/sample/write/GLD_river-sample-write.json @@ -0,0 +1,24 @@ +{ + "type":"BINARY", + "sub-type":"TEST", + "group-id":"com.atria-soft", + "description":"Write some data", + "license":"MPL-2", + "license-file":"file://../../LICENSE", + "maintainer":"file://../../authors.txt", + "author":"file://../../authors.txt", + "version":"file://../../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "write.cpp" + ], + "compilation-version": { + "c++": 2017 + }, + "dependency": [ + "audio-river", + "test-debug", + "etk" + ] +} \ No newline at end of file diff --git a/sample/write/lutin_river-sample-write.py b/sample/write/lutin_river-sample-write.py deleted file mode 100644 index 2980d9e..0000000 --- a/sample/write/lutin_river-sample-write.py +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools - - -def get_type(): - return "BINARY" - -def get_sub_type(): - return "SAMPLE" - -def get_desc(): - return "Write some data" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def configure(target, my_module): - my_module.add_src_file([ - 'write.cpp', - ]) - my_module.add_depend([ - 'audio-river', - 'test-debug', - 'etk' - ]) - return True - - - - - - - - - diff --git a/widget/GLD_audio-river-widget.json b/widget/GLD_audio-river-widget.json new file mode 100644 index 0000000..fb9affb --- /dev/null +++ b/widget/GLD_audio-river-widget.json @@ -0,0 +1,29 @@ +{ + "type":"LIBRARY", + "group-id":"com.atria-soft", + "description":"audio specific widget", + "license":"MPL-2", + "license-file":"file://../LICENSE", + "maintainer":"file://../authors.txt", + "author":"file://../authors.txt", + "version":"file://../version.txt", + "code-quality":"MEDIUM", + + "source": [ + "audio/river/widget/TemporalViewer.cpp", + "audio/river/widget/debug.cpp" + ], + "header": [ + "audio/river/widget/TemporalViewer.hpp" + ], + "compilation-version": { + "c++": 2017 + }, + "path":[ + "." + ], + "dependency": [ + "ewol", + "audio-river" + ] +} \ No newline at end of file diff --git a/widget/lutin_audio-river-widget.py b/widget/lutin_audio-river-widget.py deleted file mode 100644 index 9aaa833..0000000 --- a/widget/lutin_audio-river-widget.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/python -import realog.debug as debug -import lutin.tools as tools -import os - - -def get_type(): - return "LIBRARY" - -def get_desc(): - return "audio specific widget" - -def get_licence(): - return "MPL-2" - -def get_compagny_type(): - return "com" - -def get_compagny_name(): - return "atria-soft" - -def get_maintainer(): - return ["Mr DUPIN Edouard "] - -def get_version(): - return [0,0,0] - -def configure(target, my_module): - my_module.add_src_file([ - 'audio/river/widget/TemporalViewer.cpp', - 'audio/river/widget/debug.cpp' - ]) - my_module.add_header_file([ - 'audio/river/widget/TemporalViewer.hpp' - ]) - my_module.add_depend([ - 'ewol', - 'audio-river' - ]) - my_module.add_path(".") - return True - -