From 3bbf3500a2ffef3707b74823ece9b4e03aec36e8 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Wed, 14 Oct 2015 21:21:03 +0200 Subject: [PATCH] [DEV] update new lutin 0.8.0 --- lutin_audio-algo-river-test.py | 27 ++++++++++++--- lutin_audio-algo-river.py | 23 +++++++++++-- test/debug.cpp | 13 ------- test/debug.h | 41 ---------------------- test/main.cpp | 62 +++++++++++++++++----------------- 5 files changed, 73 insertions(+), 93 deletions(-) delete mode 100644 test/debug.cpp delete mode 100644 test/debug.h diff --git a/lutin_audio-algo-river-test.py b/lutin_audio-algo-river-test.py index ae60f78..fab2cbe 100644 --- a/lutin_audio-algo-river-test.py +++ b/lutin_audio-algo-river-test.py @@ -3,17 +3,34 @@ import lutin.module as module import lutin.tools as tools import lutin.debug as debug + +def get_type(): + return "BINARY" + +def get_sub_type(): + return "TEST" + def get_desc(): return "test for River ALGO" +def get_licence(): + return "APACHE-2" -def create(target): - my_module = module.Module(__file__, 'audio-algo-river-test', 'BINARY') +def get_compagny_type(): + return "com" + +def get_compagny_name(): + return "atria-soft" + +def get_maintainer(): + return ["Mr DUPIN Edouard "] + +def create(target, module_name): + my_module = module.Module(__file__, module_name, get_type()) my_module.add_src_file([ - 'test/main.cpp', - 'test/debug.cpp' + 'test/main.cpp' ]) - my_module.add_module_depend(['audio-algo-river']) + my_module.add_module_depend(['audio-algo-river', 'test-debug']) return my_module diff --git a/lutin_audio-algo-river.py b/lutin_audio-algo-river.py index 6fd63c9..bbba072 100644 --- a/lutin_audio-algo-river.py +++ b/lutin_audio-algo-river.py @@ -3,12 +3,30 @@ import lutin.module as module import lutin.tools as tools import lutin.debug as debug + +def get_type(): + return "LIBRARY" + def get_desc(): return "river algos" +def get_licence(): + return "APACHE-2" -def create(target): - my_module = module.Module(__file__, 'audio-algo-river', 'LIBRARY') +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 create(target, module_name): + my_module = module.Module(__file__, module_name, get_type()) my_module.add_src_file([ 'audio/algo/river/debug.cpp', 'audio/algo/river/convolution.cpp', @@ -28,7 +46,6 @@ def create(target): ]) my_module.add_module_depend(['etk', 'audio']) my_module.add_path(tools.get_current_path(__file__)) - # return module return my_module diff --git a/test/debug.cpp b/test/debug.cpp deleted file mode 100644 index 882a5c8..0000000 --- a/test/debug.cpp +++ /dev/null @@ -1,13 +0,0 @@ -/** @file - * @author Edouard DUPIN - * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) - */ - -#include "debug.h" - -int32_t appl::getLogId() { - static int32_t g_val = etk::log::registerInstance("test-LMS"); - return g_val; -} - diff --git a/test/debug.h b/test/debug.h deleted file mode 100644 index 8238049..0000000 --- a/test/debug.h +++ /dev/null @@ -1,41 +0,0 @@ -/** @file - * @author Edouard DUPIN - * @copyright 2011, Edouard DUPIN, all right reserved - * @license APACHE v2.0 (see license file) - */ - -#ifndef __APPL_DEBUG_H__ -#define __APPL_DEBUG_H__ - -#include - -namespace appl { - int32_t getLogId(); -}; - -#define APPL_BASE(info,data) TK_LOG_BASE(appl::getLogId(),info,data) - -#define APPL_PRINT(data) APPL_BASE(-1, data) -#define APPL_CRITICAL(data) APPL_BASE(1, data) -#define APPL_ERROR(data) APPL_BASE(2, data) -#define APPL_WARNING(data) APPL_BASE(3, data) -#define APPL_INFO(data) APPL_BASE(4, data) -#ifdef DEBUG - #define APPL_DEBUG(data) APPL_BASE(5, data) - #define APPL_VERBOSE(data) APPL_BASE(6, data) - #define APPL_TODO(data) APPL_BASE(4, "TODO : " << data) -#else - #define APPL_DEBUG(data) do { } while(false) - #define APPL_VERBOSE(data) do { } while(false) - #define APPL_TODO(data) do { } while(false) -#endif - -#define APPL_ASSERT(cond,data) \ - do { \ - if (!(cond)) { \ - APPL_CRITICAL(data); \ - assert(!#cond); \ - } \ - } while (0) - -#endif diff --git a/test/main.cpp b/test/main.cpp index d7c2c9c..66ea402 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -4,7 +4,7 @@ * @license APACHE v2.0 (see license file) */ -#include +#include #include #include