From 57adfb43c838004320f5a88c7531710bcc17cc37 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Thu, 7 Sep 2017 23:38:26 +0200
Subject: [PATCH] [DEV] remove STL

---
 audio/drain/Algo.hpp              | 2 +-
 audio/drain/EndPointCallback.hpp  | 4 ++--
 audio/drain/EndPointWrite.cpp     | 4 ++--
 audio/drain/EndPointWrite.hpp     | 6 +++---
 audio/drain/IOFormatInterface.cpp | 2 +-
 audio/drain/IOFormatInterface.hpp | 4 ++--
 audio/drain/Process.hpp           | 2 +-
 audio/drain/airtalgo.hpp          | 2 +-
 lutin_audio-drain-test.py         | 2 +-
 test/channelOrder.cpp             | 2 +-
 test/equalizer.cpp                | 2 +-
 test/format.cpp                   | 2 +-
 test/main.cpp                     | 2 +-
 test/resampling.cpp               | 2 +-
 test/updateFlow.cpp               | 2 +-
 15 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/audio/drain/Algo.hpp b/audio/drain/Algo.hpp
index 3751ac7..794834b 100644
--- a/audio/drain/Algo.hpp
+++ b/audio/drain/Algo.hpp
@@ -27,7 +27,7 @@ namespace audio {
 	 * @brief audio-algo library namespace
 	 */
 	namespace drain{
-		typedef std::function<void (const etk::String& _origin, const etk::String& _status)> algoStatusFunction;
+		typedef etk::Function<void (const etk::String& _origin, const etk::String& _status)> algoStatusFunction;
 		class Algo : public ememory::EnableSharedFromThis<Algo> {
 			private:
 				etk::String m_name;
diff --git a/audio/drain/EndPointCallback.hpp b/audio/drain/EndPointCallback.hpp
index e1a3167..7b4a03c 100644
--- a/audio/drain/EndPointCallback.hpp
+++ b/audio/drain/EndPointCallback.hpp
@@ -10,13 +10,13 @@
 
 namespace audio {
 	namespace drain {
-		typedef std::function<void (void* _data,
+		typedef etk::Function<void (void* _data,
 		                              const audio::Time& _playTime,
 		                              size_t _nbChunk,
 		                              enum audio::format _format,
 		                              uint32_t _frequency,
 		                              const etk::Vector<audio::channel>& _map)> playbackFunction;
-		typedef std::function<void (const void* _data,
+		typedef etk::Function<void (const void* _data,
 		                              const audio::Time& _readTime,
 		                              size_t _nbChunk,
 		                              enum audio::format _format,
diff --git a/audio/drain/EndPointWrite.cpp b/audio/drain/EndPointWrite.cpp
index 31002b4..018fd6a 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<std::mutex> lock(m_mutex);
+	std::unique_lock<ethread::Mutex> 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<std::mutex> lock(m_mutex);
+	std::unique_lock<ethread::Mutex> 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 75c1432..620db58 100644
--- a/audio/drain/EndPointWrite.hpp
+++ b/audio/drain/EndPointWrite.hpp
@@ -7,12 +7,12 @@
 
 #include <audio/drain/EndPoint.hpp>
 #include <functional>
-#include <mutex>
+#include <ethread/Mutex.hpp>
 #include <audio/drain/CircularBuffer.hpp>
 
 namespace audio {
 	namespace drain{
-		typedef std::function<void (const audio::Time& _time,
+		typedef etk::Function<void (const audio::Time& _time,
 		                              size_t _nbChunk,
 		                              enum audio::format _format,
 		                              uint32_t _frequency,
@@ -21,7 +21,7 @@ namespace audio {
 			private:
 				audio::drain::CircularBuffer m_buffer;
 				playbackFunctionWrite m_function;
-				std::mutex m_mutex;
+				ethread::Mutex m_mutex;
 			protected:
 				/**
 				 * @brief Constructor
diff --git a/audio/drain/IOFormatInterface.cpp b/audio/drain/IOFormatInterface.cpp
index f728927..2871c10 100644
--- a/audio/drain/IOFormatInterface.cpp
+++ b/audio/drain/IOFormatInterface.cpp
@@ -109,7 +109,7 @@ void audio::drain::IOFormatInterface::configurationChange() {
 		m_ioChangeFunctor();
 	}
 }
-void audio::drain::IOFormatInterface::setCallback(const std::function<void()>& _functor) {
+void audio::drain::IOFormatInterface::setCallback(const etk::Function<void()>& _functor) {
 	m_ioChangeFunctor = _functor;
 }
 
diff --git a/audio/drain/IOFormatInterface.hpp b/audio/drain/IOFormatInterface.hpp
index 6e78edf..5c6e277 100644
--- a/audio/drain/IOFormatInterface.hpp
+++ b/audio/drain/IOFormatInterface.hpp
@@ -74,14 +74,14 @@ namespace audio {
 				 */
 				int32_t getChunkSize() const;
 			protected:
-				std::function<void()> m_ioChangeFunctor; //!< function pointer on the upper class
+				etk::Function<void()> m_ioChangeFunctor; //!< function pointer on the upper class
 				void configurationChange();
 			public:
 				/**
 				 * @brief Set the callback function to be notify when the arameter change.
 				 * @param[in] _functor Function to call.
 				 */
-				void setCallback(const std::function<void()>& _functor);
+				void setCallback(const etk::Function<void()>& _functor);
 		};
 		etk::Stream& operator <<(etk::Stream& _os, const audio::drain::IOFormatInterface& _obj);
 	}
diff --git a/audio/drain/Process.hpp b/audio/drain/Process.hpp
index b99d30e..d046f7f 100644
--- a/audio/drain/Process.hpp
+++ b/audio/drain/Process.hpp
@@ -17,7 +17,7 @@
 
 namespace audio {
 	namespace drain{
-		typedef std::function<void (const etk::String& _origin, const etk::String& _status)> statusFunction;
+		typedef etk::Function<void (const etk::String& _origin, const etk::String& _status)> statusFunction;
 		class Process {
 			protected:
 				etk::Vector<int8_t> m_data; //!< temporary overlap output buffer (change size of the output data)
diff --git a/audio/drain/airtalgo.hpp b/audio/drain/airtalgo.hpp
index b637201..6b28817 100644
--- a/audio/drain/airtalgo.hpp
+++ b/audio/drain/airtalgo.hpp
@@ -31,7 +31,7 @@ namespace audio {
 		 * @param[in] _name Name of the Algorithm.
 		 * @param[in] _functor Function of the factory
 		 */
-		void addAlgoFactory(const etk::String& _name, std::function<drain::Algo*(void)> _functor);
+		void addAlgoFactory(const etk::String& _name, etk::Function<drain::Algo*(void)> _functor);
 		/**
 		 * @brief Remove a Factory Algorithm in the internal List (static for all instance)
 		 * @param[in] _name Name of the Algorithm.
diff --git a/lutin_audio-drain-test.py b/lutin_audio-drain-test.py
index 1fc05f8..147b66e 100644
--- a/lutin_audio-drain-test.py
+++ b/lutin_audio-drain-test.py
@@ -35,7 +35,7 @@ def configure(target, my_module):
 		])
 	my_module.add_depend([
 	    'audio-drain',
-	    'gtest',
+	    'etest',
 	    'etk',
 	    'test-debug'
 	    ])
diff --git a/test/channelOrder.cpp b/test/channelOrder.cpp
index 5092bcb..b8cc847 100644
--- a/test/channelOrder.cpp
+++ b/test/channelOrder.cpp
@@ -5,6 +5,6 @@
  */
 
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #include <audio/drain/Process.hpp>
 
diff --git a/test/equalizer.cpp b/test/equalizer.cpp
index 35636ae..8b45439 100644
--- a/test/equalizer.cpp
+++ b/test/equalizer.cpp
@@ -5,7 +5,7 @@
  */
 
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #include <audio/drain/Process.hpp>
 
 
diff --git a/test/format.cpp b/test/format.cpp
index 5092bcb..b8cc847 100644
--- a/test/format.cpp
+++ b/test/format.cpp
@@ -5,6 +5,6 @@
  */
 
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #include <audio/drain/Process.hpp>
 
diff --git a/test/main.cpp b/test/main.cpp
index ab82b37..3063634 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -6,7 +6,7 @@
 
 #include <etk/etk.hpp>
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 
 int main(int _argc, const char** _argv) {
 	// init Google test :
diff --git a/test/resampling.cpp b/test/resampling.cpp
index 5092bcb..b8cc847 100644
--- a/test/resampling.cpp
+++ b/test/resampling.cpp
@@ -5,6 +5,6 @@
  */
 
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #include <audio/drain/Process.hpp>
 
diff --git a/test/updateFlow.cpp b/test/updateFlow.cpp
index 5092bcb..b8cc847 100644
--- a/test/updateFlow.cpp
+++ b/test/updateFlow.cpp
@@ -5,6 +5,6 @@
  */
 
 #include <test-debug/debug.hpp>
-#include <gtest/gtest.h>
+#include <etest/etest.hpp>
 #include <audio/drain/Process.hpp>