From 5594a64028a517a97cac7dbde4bb8c95ceecf78a Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 8 Mar 2016 21:29:34 +0100 Subject: [PATCH] [DEV] update of external of elog and ethread --- audio/algo/chunkware/Limiter.h | 4 ++-- audio/algo/chunkware/debug.cpp | 2 +- audio/algo/chunkware/debug.h | 4 ++-- test/main.cpp | 22 +++++++++++----------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/audio/algo/chunkware/Limiter.h b/audio/algo/chunkware/Limiter.h index 3134907..fa098fe 100644 --- a/audio/algo/chunkware/Limiter.h +++ b/audio/algo/chunkware/Limiter.h @@ -97,7 +97,7 @@ namespace audio { } protected: - std11::chrono::microseconds m_attackTime; //!< attaque time in ms. + std::chrono::microseconds m_attackTime; //!< attaque time in ms. public: virtual void setAttack(double _ms); virtual double getAttack() const { @@ -105,7 +105,7 @@ namespace audio { } protected: - std11::chrono::microseconds m_releaseTime; //!< attaque time in ms. + std::chrono::microseconds m_releaseTime; //!< attaque time in ms. public: virtual void setRelease(double _ms); virtual double getRelease() const { diff --git a/audio/algo/chunkware/debug.cpp b/audio/algo/chunkware/debug.cpp index ca1c1e5..2656ba5 100644 --- a/audio/algo/chunkware/debug.cpp +++ b/audio/algo/chunkware/debug.cpp @@ -27,7 +27,7 @@ int32_t audio::algo::chunkware::getLogId() { - static int32_t g_val = etk::log::registerInstance("audio-algo-chunkware"); + static int32_t g_val = elog::registerInstance("audio-algo-chunkware"); return g_val; } diff --git a/audio/algo/chunkware/debug.h b/audio/algo/chunkware/debug.h index 8be20e9..7b6ca3d 100644 --- a/audio/algo/chunkware/debug.h +++ b/audio/algo/chunkware/debug.h @@ -25,7 +25,7 @@ #pragma once -#include +#include namespace audio { namespace algo { @@ -35,7 +35,7 @@ namespace audio { } } -#define AA_CHUNK_BASE(info,data) TK_LOG_BASE(audio::algo::chunkware::getLogId(),info,data) +#define AA_CHUNK_BASE(info,data) ELOG_BASE(audio::algo::chunkware::getLogId(),info,data) #define AA_CHUNK_PRINT(data) AA_CHUNK_BASE(-1, data) #define AA_CHUNK_CRITICAL(data) AA_CHUNK_BASE(1, data) diff --git a/test/main.cpp b/test/main.cpp index bcfd5c6..b67ebd8 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -41,11 +41,11 @@ static std::vector convert(const std::vector& _data) { class Performance { private: - std11::chrono::steady_clock::time_point m_timeStart; - std11::chrono::steady_clock::time_point m_timeStop; - std11::chrono::nanoseconds m_totalTimeProcessing; - std11::chrono::nanoseconds m_minProcessing; - std11::chrono::nanoseconds m_maxProcessing; + std::chrono::steady_clock::time_point m_timeStart; + std::chrono::steady_clock::time_point m_timeStop; + std::chrono::nanoseconds m_totalTimeProcessing; + std::chrono::nanoseconds m_minProcessing; + std::chrono::nanoseconds m_maxProcessing; int32_t m_totalIteration; public: Performance() : @@ -56,11 +56,11 @@ class Performance { } void tic() { - m_timeStart = std11::chrono::steady_clock::now(); + m_timeStart = std::chrono::steady_clock::now(); } void toc() { - m_timeStop = std11::chrono::steady_clock::now(); - std11::chrono::nanoseconds time = m_timeStop - m_timeStart; + m_timeStop = std::chrono::steady_clock::now(); + std::chrono::nanoseconds time = m_timeStop - m_timeStart; m_minProcessing = std::min(m_minProcessing, time); m_maxProcessing = std::max(m_maxProcessing, time); m_totalTimeProcessing += time; @@ -68,13 +68,13 @@ class Performance { } - std11::chrono::nanoseconds getTotalTimeProcessing() { + std::chrono::nanoseconds getTotalTimeProcessing() { return m_totalTimeProcessing; } - std11::chrono::nanoseconds getMinProcessing() { + std::chrono::nanoseconds getMinProcessing() { return m_minProcessing; } - std11::chrono::nanoseconds getMaxProcessing() { + std::chrono::nanoseconds getMaxProcessing() { return m_maxProcessing; } int32_t getTotalIteration() {