From 3e2ef8ce590ac989801f73d234f1f970a077dfbb Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Thu, 14 Sep 2017 00:59:21 +0200
Subject: [PATCH] [DEV] continue removing STL

---
 audio/drain/Algo.cpp                                        | 2 +-
 audio/drain/Algo.hpp                                        | 2 +-
 audio/drain/EndPointCallback.hpp                            | 2 +-
 audio/drain/EndPointWrite.cpp                               | 4 ++--
 audio/drain/EndPointWrite.hpp                               | 2 +-
 audio/drain/IOFormatInterface.hpp                           | 2 +-
 audio/drain/Process.cpp                                     | 2 +-
 tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp | 6 +++---
 .../appl/widget/DisplayFrequency.cpp                        | 6 +++---
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/audio/drain/Algo.cpp b/audio/drain/Algo.cpp
index 42d91b9..6352a98 100644
--- a/audio/drain/Algo.cpp
+++ b/audio/drain/Algo.cpp
@@ -4,7 +4,7 @@
  * @license MPL v2.0 (see license file)
  */
 #include <audio/drain/Algo.hpp>
-#include <functional>
+#include <etk/Function.hpp>
 #include "debug.hpp"
 
 audio::drain::Algo::Algo() :
diff --git a/audio/drain/Algo.hpp b/audio/drain/Algo.hpp
index 794834b..bedb8cd 100644
--- a/audio/drain/Algo.hpp
+++ b/audio/drain/Algo.hpp
@@ -11,7 +11,7 @@
 #include <audio/format.hpp>
 #include <audio/channel.hpp>
 #include <chrono>
-#include <functional>
+#include <etk/Function.hpp>
 #include <ememory/memory.hpp>
 #include "AutoLogInOut.hpp"
 #include "IOFormatInterface.hpp"
diff --git a/audio/drain/EndPointCallback.hpp b/audio/drain/EndPointCallback.hpp
index 7b4a03c..baeb6ba 100644
--- a/audio/drain/EndPointCallback.hpp
+++ b/audio/drain/EndPointCallback.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <audio/drain/EndPoint.hpp>
-#include <functional>
+#include <etk/Function.hpp>
 
 namespace audio {
 	namespace drain {
diff --git a/audio/drain/EndPointWrite.cpp b/audio/drain/EndPointWrite.cpp
index 018fd6a..6c64b50 100644
--- a/audio/drain/EndPointWrite.cpp
+++ b/audio/drain/EndPointWrite.cpp
@@ -70,7 +70,7 @@ bool audio::drain::EndPointWrite::process(audio::Time& _time,
 	// set output pointer:
 	_outputNbChunk = m_outputData.size()/(m_formatSize*m_output.getMap().size());
 	_output = &m_outputData[0];
-	std::unique_lock<ethread::Mutex> lock(m_mutex);
+	ethread::UniqueLock lock(m_mutex);
 	// check if data in the tmpBuffer
 	if (m_buffer.getSize() == 0) {
 		if (m_bufferUnderFlowSize == 0) {
@@ -110,7 +110,7 @@ bool audio::drain::EndPointWrite::process(audio::Time& _time,
 }
 
 void audio::drain::EndPointWrite::write(const void* _value, size_t _nbChunk) {
-	std::unique_lock<ethread::Mutex> lock(m_mutex);
+	ethread::UniqueLock lock(m_mutex);
 	DRAIN_VERBOSE("[ASYNC] Write data : " << _nbChunk << " chunks" << " ==> " << m_output);
 	int32_t nbOverflow = m_buffer.write(_value, _nbChunk);
 	if (nbOverflow > 0) {
diff --git a/audio/drain/EndPointWrite.hpp b/audio/drain/EndPointWrite.hpp
index 620db58..ae6025c 100644
--- a/audio/drain/EndPointWrite.hpp
+++ b/audio/drain/EndPointWrite.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include <audio/drain/EndPoint.hpp>
-#include <functional>
+#include <etk/Function.hpp>
 #include <ethread/Mutex.hpp>
 #include <audio/drain/CircularBuffer.hpp>
 
diff --git a/audio/drain/IOFormatInterface.hpp b/audio/drain/IOFormatInterface.hpp
index 5c6e277..29baa5f 100644
--- a/audio/drain/IOFormatInterface.hpp
+++ b/audio/drain/IOFormatInterface.hpp
@@ -11,7 +11,7 @@
 #include <audio/format.hpp>
 #include <audio/channel.hpp>
 #include <chrono>
-#include <functional>
+#include <etk/Function.hpp>
 #include <ememory/memory.hpp>
 #include "AutoLogInOut.hpp"
 #include "debug.hpp"
diff --git a/audio/drain/Process.cpp b/audio/drain/Process.cpp
index d7e3daf..17ddad2 100644
--- a/audio/drain/Process.cpp
+++ b/audio/drain/Process.cpp
@@ -439,7 +439,7 @@ bool audio::drain::Process::processIn(void* _inData,
 	return false;
 }
 
-static void link(etk::FSNode& _node, const etk::String& _first, const etk::String& _op, const std::string& _second, bool _isLink=true) {
+static void link(etk::FSNode& _node, const etk::String& _first, const etk::String& _op, const etk::String& _second, bool _isLink=true) {
 	if (_op == "->") {
 		if (_isLink) {
 			_node << "			" << _first << " -> " << _second << ";\n";
diff --git a/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp b/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
index 28029c8..b24056e 100644
--- a/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
+++ b/tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
@@ -83,17 +83,17 @@ void appl::widget::DisplayFrequency::onRegenerateDisplay() {
 	bool displayLog = true;
 	for (size_t kkk=0; kkk<m_data.size(); kkk++) {
 		for (size_t iii=0; iii<m_data[kkk].size(); ++iii) {
-			if (std::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) {
+			if (etk::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) {
 				m_gainMax = etk::max(m_gainMax, m_data[kkk][iii].second);
 				m_gainMin = etk::min(m_gainMin, m_data[kkk][iii].second);
 			}
 			if (displayLog == false) {
-				if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
+				if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
 					m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first);
 					m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first);
 				}
 			} else {
-				if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
+				if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
 					if (m_data[kkk][iii].first == 0) {
 						continue;
 					}
diff --git a/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp b/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
index e12caa9..9d91118 100644
--- a/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
+++ b/tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
@@ -83,18 +83,18 @@ void appl::widget::DisplayFrequency::onRegenerateDisplay() {
 	bool displayLog = true;
 	for (size_t kkk=0; kkk<m_data.size(); kkk++) {
 		for (size_t iii=0; iii<m_data[kkk].size(); ++iii) {
-			if (std::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) {
+			if (etk::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) {
 				m_gainMax = etk::max(m_gainMax, m_data[kkk][iii].second);
 				m_gainMin = etk::min(m_gainMin, m_data[kkk][iii].second);
 				//APPL_INFO("plop " << m_data[kkk][iii].second);
 			}
 			if (displayLog == false) {
-				if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
+				if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
 					m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first);
 					m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first);
 				}
 			} else {
-				if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
+				if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
 					if (m_data[kkk][iii].first == 0) {
 						continue;
 					}