From e7511a0b9240d2b4aa8863d57c557f66afdaac1d Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Tue, 8 Mar 2016 21:29:34 +0100
Subject: [PATCH] [DEV] update of external of elog and ethread

---
 audio/orchestra/Api.cpp                       |  2 +-
 audio/orchestra/Api.h                         |  6 ++--
 audio/orchestra/api/Alsa.cpp                  | 32 +++++++++----------
 audio/orchestra/api/Alsa.h                    |  4 +--
 audio/orchestra/api/Android.cpp               |  2 +-
 .../orchestra/api/AndroidNativeInterface.cpp  |  8 ++---
 audio/orchestra/api/AndroidNativeInterface.h  |  2 +-
 audio/orchestra/api/Core.cpp                  | 10 +++---
 audio/orchestra/api/CoreIos.h                 |  2 +-
 audio/orchestra/api/Ds.cpp                    |  8 ++---
 audio/orchestra/api/Ds.h                      |  2 +-
 audio/orchestra/api/Jack.cpp                  | 16 +++++-----
 audio/orchestra/api/Jack.h                    |  2 +-
 audio/orchestra/api/Pulse.cpp                 | 12 +++----
 audio/orchestra/api/Pulse.h                   |  2 +-
 audio/orchestra/debug.cpp                     |  2 +-
 audio/orchestra/debug.h                       |  4 +--
 17 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/audio/orchestra/Api.cpp b/audio/orchestra/Api.cpp
index 97b4665..774f125 100644
--- a/audio/orchestra/Api.cpp
+++ b/audio/orchestra/Api.cpp
@@ -58,7 +58,7 @@ audio::orchestra::Api::~Api() {
 enum audio::orchestra::error audio::orchestra::Api::startStream() {
 	ATA_VERBOSE("Start Stream");
 	m_startTime = audio::Time::now();
-	m_duration = std11::chrono::microseconds(0);
+	m_duration = std::chrono::microseconds(0);
 	return audio::orchestra::error_none;
 }
 
diff --git a/audio/orchestra/Api.h b/audio/orchestra/Api.h
index e1304db..a41413f 100644
--- a/audio/orchestra/Api.h
+++ b/audio/orchestra/Api.h
@@ -27,7 +27,7 @@ namespace audio {
 		 * @param _nbChunk The number of chunk of input or output chunk in the buffer (same size).
 		 * @param _status List of error that occured in the laps of time.
 		 */
-		typedef std11::function<int32_t (const void* _inputBuffer,
+		typedef std::function<int32_t (const void* _inputBuffer,
 		                                 const audio::Time& _timeInput,
 		                                 void* _outputBuffer,
 		                                 const audio::Time& _timeOutput,
@@ -85,7 +85,7 @@ namespace audio {
 				}
 				
 			protected:
-				mutable std11::mutex m_mutex;
+				mutable std::mutex m_mutex;
 				audio::orchestra::AirTAudioCallback m_callback;
 				uint32_t m_device[2]; // Playback and record, respectively.
 				enum audio::orchestra::mode m_mode; // audio::orchestra::mode_output, audio::orchestra::mode_input, or audio::orchestra::mode_duplex.
@@ -166,7 +166,7 @@ namespace audio {
 				                    uint32_t _firstChannel);
 				
 			public:
-				virtual bool isMasterOf(std11::shared_ptr<audio::orchestra::Api> _api) {
+				virtual bool isMasterOf(std::shared_ptr<audio::orchestra::Api> _api) {
 					return false;
 				};
 		};
diff --git a/audio/orchestra/api/Alsa.cpp b/audio/orchestra/api/Alsa.cpp
index e31c4e9..e77bc95 100644
--- a/audio/orchestra/api/Alsa.cpp
+++ b/audio/orchestra/api/Alsa.cpp
@@ -13,7 +13,7 @@
 #include <audio/orchestra/Interface.h>
 #include <audio/orchestra/debug.h>
 #include <etk/stdTools.h>
-#include <etk/thread/tools.h>
+#include <ethread/tools.h>
 #include <limits.h>
 #include <audio/orchestra/api/Alsa.h>
 extern "C" {
@@ -41,9 +41,9 @@ namespace audio {
 				public:
 					snd_pcm_t *handle;
 					bool xrun[2];
-					std11::condition_variable runnable_cv;
+					std::condition_variable runnable_cv;
 					bool runnable;
-					std11::thread* thread;
+					std::thread* thread;
 					bool threadRunning;
 					bool mmapInterface; //!< enable or disable mmap mode...
 					enum timestampMode timeMode; //!< the timestamp of the flow came from the harware.
@@ -804,13 +804,13 @@ bool audio::orchestra::api::Alsa::openName(const std::string& _deviceName,
 	// Setup callback thread.
 	m_private->threadRunning = true;
 	ATA_INFO("create thread ...");
-	m_private->thread = new std11::thread(&audio::orchestra::api::Alsa::alsaCallbackEvent, this);
+	m_private->thread = new std::thread(&audio::orchestra::api::Alsa::alsaCallbackEvent, this);
 	if (m_private->thread == nullptr) {
 		m_private->threadRunning = false;
 		ATA_ERROR("creating callback thread!");
 		goto error;
 	}
-	etk::thread::setPriority(*m_private->thread, -6);
+	ethread::setPriority(*m_private->thread, -6);
 	return true;
 error:
 	if (m_private->handle) {
@@ -876,7 +876,7 @@ enum audio::orchestra::error audio::orchestra::api::Alsa::startStream() {
 		ATA_ERROR("the stream is already running!");
 		return audio::orchestra::error_warning;
 	}
-	std11::unique_lock<std11::mutex> lck(m_mutex);
+	std::unique_lock<std::mutex> lck(m_mutex);
 	int32_t result = 0;
 	snd_pcm_state_t state;
 	if (m_private->handle == nullptr) {
@@ -910,7 +910,7 @@ enum audio::orchestra::error audio::orchestra::api::Alsa::stopStream() {
 		return audio::orchestra::error_warning;
 	}
 	m_state = audio::orchestra::state_stopped;
-	std11::unique_lock<std11::mutex> lck(m_mutex);
+	std::unique_lock<std::mutex> lck(m_mutex);
 	int32_t result = 0;
 	if (m_mode == audio::orchestra::mode_output) {
 		result = snd_pcm_drain(m_private->handle);
@@ -937,7 +937,7 @@ enum audio::orchestra::error audio::orchestra::api::Alsa::abortStream() {
 		return audio::orchestra::error_warning;
 	}
 	m_state = audio::orchestra::state_stopped;
-	std11::unique_lock<std11::mutex> lck(m_mutex);
+	std::unique_lock<std::mutex> lck(m_mutex);
 	int32_t result = 0;
 	result = snd_pcm_drop(m_private->handle);
 	if (result < 0) {
@@ -980,7 +980,7 @@ static int32_t wait_for_poll(snd_pcm_t* _handle, struct pollfd* _ufds, unsigned
 void audio::orchestra::api::Alsa::callbackEvent() {
 	// Lock while the system is not started ...
 	if (m_state == audio::orchestra::state_stopped) {
-		std11::unique_lock<std11::mutex> lck(m_mutex);
+		std::unique_lock<std::mutex> lck(m_mutex);
 		while (!m_private->runnable) {
 			m_private->runnable_cv.wait(lck);
 		}
@@ -988,7 +988,7 @@ void audio::orchestra::api::Alsa::callbackEvent() {
 			return;
 		}
 	}
-	etk::thread::setName("Alsa IO-" + m_name);
+	ethread::setName("Alsa IO-" + m_name);
 	//Wait data with poll
 	std::vector<struct pollfd> ufds;
 	signed short *ptr;
@@ -1121,7 +1121,7 @@ void audio::orchestra::api::Alsa::callbackEventOneCycleRead() {
 		// !!! goto unlock;
 	}
 	
-	std11::unique_lock<std11::mutex> lck(m_mutex);
+	std::unique_lock<std::mutex> lck(m_mutex);
 	// Setup parameters.
 	if (m_doConvertBuffer[1]) {
 		buffer = m_deviceBuffer;
@@ -1257,7 +1257,7 @@ void audio::orchestra::api::Alsa::callbackEventOneCycleWrite() {
 		abortStream();
 		return;
 	}
-	std11::unique_lock<std11::mutex> lck(m_mutex);
+	std::unique_lock<std::mutex> lck(m_mutex);
 	// Setup parameters and do buffer conversion if necessary.
 	if (m_doConvertBuffer[0]) {
 		buffer = m_deviceBuffer;
@@ -1364,7 +1364,7 @@ void audio::orchestra::api::Alsa::callbackEventOneCycleMMAPWrite() {
 		return;
 	}
 	{
-		std11::unique_lock<std11::mutex> lck(m_mutex);
+		std::unique_lock<std::mutex> lck(m_mutex);
 		// Setup parameters and do buffer conversion if necessary.
 		if (m_doConvertBuffer[0]) {
 			buffer = m_deviceBuffer;
@@ -1472,7 +1472,7 @@ void audio::orchestra::api::Alsa::callbackEventOneCycleMMAPRead() {
 		goto unlock;
 	}
 	{
-		std11::unique_lock<std11::mutex> lck(m_mutex);
+		std::unique_lock<std::mutex> lck(m_mutex);
 		// Setup parameters.
 		if (m_doConvertBuffer[1]) {
 			buffer = m_deviceBuffer;
@@ -1566,8 +1566,8 @@ unlock:
 }
 
 
-bool audio::orchestra::api::Alsa::isMasterOf(std11::shared_ptr<audio::orchestra::Api> _api) {
-	std11::shared_ptr<audio::orchestra::api::Alsa> slave = std::dynamic_pointer_cast<audio::orchestra::api::Alsa>(_api);
+bool audio::orchestra::api::Alsa::isMasterOf(std::shared_ptr<audio::orchestra::Api> _api) {
+	std::shared_ptr<audio::orchestra::api::Alsa> slave = std::dynamic_pointer_cast<audio::orchestra::api::Alsa>(_api);
 	if (slave == nullptr) {
 		ATA_ERROR("NULL ptr API (not ALSA ...)");
 		return false;
diff --git a/audio/orchestra/api/Alsa.h b/audio/orchestra/api/Alsa.h
index 0a7d7a0..f9f928c 100644
--- a/audio/orchestra/api/Alsa.h
+++ b/audio/orchestra/api/Alsa.h
@@ -50,7 +50,7 @@ namespace audio {
 				private:
 					static void alsaCallbackEvent(void* _userData);
 				private:
-					std11::shared_ptr<AlsaPrivate> m_private;
+					std::shared_ptr<AlsaPrivate> m_private;
 					std::vector<audio::orchestra::DeviceInfo> m_devices;
 					void saveDeviceInfo();
 					bool open(uint32_t _device,
@@ -72,7 +72,7 @@ namespace audio {
 					              const audio::orchestra::StreamOptions& _options);
 					virtual audio::Time getStreamTime();
 				public:
-					bool isMasterOf(std11::shared_ptr<audio::orchestra::Api> _api);
+					bool isMasterOf(std::shared_ptr<audio::orchestra::Api> _api);
 			};
 		}
 	}
diff --git a/audio/orchestra/api/Android.cpp b/audio/orchestra/api/Android.cpp
index f1e18d9..b32e6da 100644
--- a/audio/orchestra/api/Android.cpp
+++ b/audio/orchestra/api/Android.cpp
@@ -148,7 +148,7 @@ bool audio::orchestra::api::Android::open(uint32_t _device,
 	m_userFormat = _format;
 	m_nUserChannels[modeToIdTable(m_mode)] = _channels;
 	
-	m_uid = audio::orchestra::api::android::open(_device, m_mode, _channels, _firstChannel, _sampleRate, _format, _bufferSize, _options, std11::static_pointer_cast<audio::orchestra::api::Android>(shared_from_this()));
+	m_uid = audio::orchestra::api::android::open(_device, m_mode, _channels, _firstChannel, _sampleRate, _format, _bufferSize, _options, std::static_pointer_cast<audio::orchestra::api::Android>(shared_from_this()));
 	if (m_uid < 0) {
 		ret = false;
 	} else {
diff --git a/audio/orchestra/api/AndroidNativeInterface.cpp b/audio/orchestra/api/AndroidNativeInterface.cpp
index 2d278ae..4b19190 100644
--- a/audio/orchestra/api/AndroidNativeInterface.cpp
+++ b/audio/orchestra/api/AndroidNativeInterface.cpp
@@ -253,7 +253,7 @@ class AndroidOrchestraContext {
 			} else {
 				info.input = true;
 			}
-			std11::shared_ptr<const ejson::Array> list = doc.getArray("sample-rate");
+			std::shared_ptr<const ejson::Array> list = doc.getArray("sample-rate");
 			if (list != nullptr) {
 				for (size_t iii=0; iii<list->size(); ++iii) {
 					info.sampleRates.push_back(int32_t(list->getNumberValue(iii, 48000)));
@@ -276,7 +276,7 @@ class AndroidOrchestraContext {
 			return info;
 		}
 	private:
-		std::vector<std11::weak_ptr<audio::orchestra::api::Android> > m_instanceList; // list of connected handle ...
+		std::vector<std::weak_ptr<audio::orchestra::api::Android> > m_instanceList; // list of connected handle ...
 		//AndroidAudioCallback m_audioCallBack;
 		//void* m_audioCallBackUserData;
 	public:
@@ -288,7 +288,7 @@ class AndroidOrchestraContext {
 		             audio::format _format,
 		             uint32_t *_bufferSize,
 		             const audio::orchestra::StreamOptions& _options,
-		             std11::shared_ptr<audio::orchestra::api::Android> _instance) {
+		             std::shared_ptr<audio::orchestra::api::Android> _instance) {
 			ATA_DEBUG("C->java : audio open device");
 			int status;
 			if(!java_attach_current_thread(&status)) {
@@ -422,7 +422,7 @@ int32_t audio::orchestra::api::android::open(uint32_t _device,
                                              audio::format _format,
                                              uint32_t *_bufferSize,
                                              const audio::orchestra::StreamOptions& _options,
-                                             std11::shared_ptr<audio::orchestra::api::Android> _instance) {
+                                             std::shared_ptr<audio::orchestra::api::Android> _instance) {
 	if (s_localContext == nullptr) {
 		return -1;
 	}
diff --git a/audio/orchestra/api/AndroidNativeInterface.h b/audio/orchestra/api/AndroidNativeInterface.h
index 1647c38..f6b130b 100644
--- a/audio/orchestra/api/AndroidNativeInterface.h
+++ b/audio/orchestra/api/AndroidNativeInterface.h
@@ -29,7 +29,7 @@ namespace audio {
 				             audio::format _format,
 				             uint32_t *_bufferSize,
 				             const audio::orchestra::StreamOptions& _options,
-				             std11::shared_ptr<audio::orchestra::api::Android> _instance);
+				             std::shared_ptr<audio::orchestra::api::Android> _instance);
 				enum audio::orchestra::error closeStream(int32_t _id);
 				enum audio::orchestra::error startStream(int32_t _id);
 				enum audio::orchestra::error stopStream(int32_t _id);
diff --git a/audio/orchestra/api/Core.cpp b/audio/orchestra/api/Core.cpp
index 69c80f7..bc008d1 100644
--- a/audio/orchestra/api/Core.cpp
+++ b/audio/orchestra/api/Core.cpp
@@ -17,7 +17,7 @@
 #include <audio/orchestra/Interface.h>
 #include <audio/orchestra/debug.h>
 #include <thread>
-#include <etk/thread/tools.h>
+#include <ethread/tools.h>
 #include <audio/orchestra/api/Core.h>
 
 std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Core::create() {
@@ -40,7 +40,7 @@ namespace audio {
 					uint32_t nStreams[2]; // number of streams to use
 					bool xrun[2];
 					char *deviceBuffer;
-					std11::condition_variable condition;
+					std::condition_variable condition;
 					int32_t drainCounter; // Tracks callback counts when draining
 					bool internalDrain; // Indicates if stop is initiated from callback or not.
 					CorePrivate() :
@@ -970,7 +970,7 @@ enum audio::orchestra::error audio::orchestra::api::Core::stopStream() {
 	if (    m_mode == audio::orchestra::mode_output
 	     || m_mode == audio::orchestra::mode_duplex) {
 		if (m_private->drainCounter == 0) {
-			std11::unique_lock<std11::mutex> lck(m_mutex);
+			std::unique_lock<std::mutex> lck(m_mutex);
 			m_private->drainCounter = 2;
 			m_private->condition.wait(lck);
 		}
@@ -1016,7 +1016,7 @@ enum audio::orchestra::error audio::orchestra::api::Core::abortStream() {
 // callbackEvent() function probably should return before the AudioDeviceStop()
 // function is called.
 void audio::orchestra::api::Core::coreStopStream(void *_userData) {
-	etk::thread::setName("CoreAudio_stopStream");
+	ethread::setName("CoreAudio_stopStream");
 	audio::orchestra::api::Core* myClass = reinterpret_cast<audio::orchestra::api::Core*>(_userData);
 	myClass->stopStream();
 }
@@ -1039,7 +1039,7 @@ bool audio::orchestra::api::Core::callbackEvent(AudioDeviceID _deviceId,
 		m_state = audio::orchestra::state_stopping;
 		ATA_VERBOSE("Set state as stopping");
 		if (m_private->internalDrain == true) {
-			new std11::thread(&audio::orchestra::api::Core::coreStopStream, this);
+			new std::thread(&audio::orchestra::api::Core::coreStopStream, this);
 		} else {
 			// external call to stopStream()
 			m_private->condition.notify_one();
diff --git a/audio/orchestra/api/CoreIos.h b/audio/orchestra/api/CoreIos.h
index e41374c..82abf1a 100644
--- a/audio/orchestra/api/CoreIos.h
+++ b/audio/orchestra/api/CoreIos.h
@@ -47,7 +47,7 @@ namespace audio {
 					                   int32_t _nbChunk,
 					                   const audio::Time& _time);
 				public:
-					std11::shared_ptr<CoreIosPrivate> m_private;
+					std::shared_ptr<CoreIosPrivate> m_private;
 			};
 		}
 	}
diff --git a/audio/orchestra/api/Ds.cpp b/audio/orchestra/api/Ds.cpp
index 6957fbf..d9e9d54 100644
--- a/audio/orchestra/api/Ds.cpp
+++ b/audio/orchestra/api/Ds.cpp
@@ -9,7 +9,7 @@
 #if defined(ORCHESTRA_BUILD_DS)
 #include <audio/orchestra/Interface.h>
 #include <audio/orchestra/debug.h>
-#include <etk/thread/tools.h>
+#include <ethread/tools.h>
 #include <audio/orchestra/api/Ds.h>
 
 #undef __class__
@@ -75,7 +75,7 @@ namespace audio {
 		namespace api {
 			class DsPrivate {
 				public:
-					std11::shared_ptr<std11::thread> thread;
+					std::shared_ptr<std::thread> thread;
 					bool threadRunning;
 					uint32_t drainCounter; // Tracks callback counts when draining
 					bool internalDrain; // Indicates if stop is initiated from callback or not.
@@ -765,7 +765,7 @@ bool audio::orchestra::api::Ds::open(uint32_t _device,
 	// Setup the callback thread.
 	if (m_private->threadRunning == false) {
 		m_private->threadRunning = true;
-		std11::shared_ptr<std11::thread> tmpThread(new std11::thread(&audio::orchestra::api::Ds::dsCallbackEvent, this));
+		std::shared_ptr<std::thread> tmpThread(new std::thread(&audio::orchestra::api::Ds::dsCallbackEvent, this));
 		m_private->thread =	std::move(tmpThread);
 		if (m_private->thread == nullptr) {
 			ATA_ERROR("error creating callback thread!");
@@ -988,7 +988,7 @@ enum audio::orchestra::error audio::orchestra::api::Ds::abortStream() {
 }
 
 void audio::orchestra::api::Ds::callbackEvent() {
-	etk::thread::setName("DS IO-" + m_name);
+	ethread::setName("DS IO-" + m_name);
 	if (m_state == audio::orchestra::state_stopped || m_state == audio::orchestra::state_stopping) {
 		Sleep(50); // sleep 50 milliseconds
 		return;
diff --git a/audio/orchestra/api/Ds.h b/audio/orchestra/api/Ds.h
index 9782d29..0d43334 100644
--- a/audio/orchestra/api/Ds.h
+++ b/audio/orchestra/api/Ds.h
@@ -34,7 +34,7 @@ namespace audio {
 					void callbackEvent();
 				private:
 					static void dsCallbackEvent(void *_userData);
-					std11::shared_ptr<DsPrivate> m_private;
+					std::shared_ptr<DsPrivate> m_private;
 					bool m_coInitialized;
 					bool m_buffersRolling;
 					long m_duplexPrerollBytes;
diff --git a/audio/orchestra/api/Jack.cpp b/audio/orchestra/api/Jack.cpp
index 046c4ad..ff48f8c 100644
--- a/audio/orchestra/api/Jack.cpp
+++ b/audio/orchestra/api/Jack.cpp
@@ -13,7 +13,7 @@
 #include <audio/orchestra/Interface.h>
 #include <audio/orchestra/debug.h>
 #include <string.h>
-#include <etk/thread/tools.h>
+#include <ethread/tools.h>
 #include <audio/orchestra/api/Jack.h>
 
 #undef __class__
@@ -68,7 +68,7 @@ namespace audio {
 					jack_port_t **ports[2];
 					std::string deviceName[2];
 					bool xrun[2];
-					std11::condition_variable condition;
+					std::condition_variable condition;
 					int32_t drainCounter; // Tracks callback counts when draining
 					bool internalDrain; // Indicates if stop is initiated from callback or not.
 					
@@ -231,7 +231,7 @@ int32_t audio::orchestra::api::Jack::jackCallbackHandler(jack_nframes_t _nframes
 // it this way because the jackShutdown() function must return before
 // the jack_deactivate() function (in closeStream()) will return.
 void audio::orchestra::api::Jack::jackCloseStream(void* _userData) {
-	etk::thread::setName("Jack_closeStream");
+	ethread::setName("Jack_closeStream");
 	audio::orchestra::api::Jack* myClass = reinterpret_cast<audio::orchestra::api::Jack*>(_userData);
 	myClass->closeStream();
 }
@@ -246,7 +246,7 @@ void audio::orchestra::api::Jack::jackShutdown(void* _userData) {
 	if (myClass->isStreamRunning() == false) {
 		return;
 	}
-	new std11::thread(&audio::orchestra::api::Jack::jackCloseStream, _userData);
+	new std::thread(&audio::orchestra::api::Jack::jackCloseStream, _userData);
 	ATA_ERROR("The Jack server is shutting down this client ... stream stopped and closed!!");
 }
 
@@ -600,7 +600,7 @@ enum audio::orchestra::error audio::orchestra::api::Jack::stopStream() {
 	     || m_mode == audio::orchestra::mode_duplex) {
 		if (m_private->drainCounter == 0) {
 			m_private->drainCounter = 2;
-			std11::unique_lock<std11::mutex> lck(m_mutex);
+			std::unique_lock<std::mutex> lck(m_mutex);
 			m_private->condition.wait(lck);
 		}
 	}
@@ -627,7 +627,7 @@ enum audio::orchestra::error audio::orchestra::api::Jack::abortStream() {
 // callbackEvent() function must return before the jack_deactivate()
 // function will return.
 static void jackStopStream(void* _userData) {
-	etk::thread::setName("Jack_stopStream");
+	ethread::setName("Jack_stopStream");
 	audio::orchestra::api::Jack* myClass = reinterpret_cast<audio::orchestra::api::Jack*>(_userData);
 	myClass->stopStream();
 }
@@ -649,7 +649,7 @@ bool audio::orchestra::api::Jack::callbackEvent(uint64_t _nframes) {
 	if (m_private->drainCounter > 3) {
 		m_state = audio::orchestra::state_stopping;
 		if (m_private->internalDrain == true) {
-			new std11::thread(jackStopStream, this);
+			new std::thread(jackStopStream, this);
 		} else {
 			m_private->condition.notify_one();
 		}
@@ -676,7 +676,7 @@ bool audio::orchestra::api::Jack::callbackEvent(uint64_t _nframes) {
 		if (cbReturnValue == 2) {
 			m_state = audio::orchestra::state_stopping;
 			m_private->drainCounter = 2;
-			new std11::thread(jackStopStream, this);
+			new std::thread(jackStopStream, this);
 			return true;
 		}
 		else if (cbReturnValue == 1) {
diff --git a/audio/orchestra/api/Jack.h b/audio/orchestra/api/Jack.h
index 2e64e12..5cdfe9c 100644
--- a/audio/orchestra/api/Jack.h
+++ b/audio/orchestra/api/Jack.h
@@ -40,7 +40,7 @@ namespace audio {
 					static void jackShutdown(void* _userData);
 					static int32_t jackCallbackHandler(jack_nframes_t _nframes, void* _userData);
 				private:
-					std11::shared_ptr<JackPrivate> m_private;
+					std::shared_ptr<JackPrivate> m_private;
 					bool open(uint32_t _device,
 					          audio::orchestra::mode _mode,
 					          uint32_t _channels,
diff --git a/audio/orchestra/api/Pulse.cpp b/audio/orchestra/api/Pulse.cpp
index bfa3918..4634145 100644
--- a/audio/orchestra/api/Pulse.cpp
+++ b/audio/orchestra/api/Pulse.cpp
@@ -15,7 +15,7 @@
 #include <pulse/error.h>
 #include <pulse/simple.h>
 #include <cstdio>
-#include <etk/thread/tools.h>
+#include <ethread/tools.h>
 #include <audio/orchestra/api/PulseDeviceList.h>
 #include <audio/orchestra/api/Pulse.h>
 
@@ -56,9 +56,9 @@ namespace audio {
 			class PulsePrivate {
 				public:
 					pa_simple* handle;
-					std11::shared_ptr<std11::thread> thread;
+					std::shared_ptr<std::thread> thread;
 					bool threadRunning;
-					std11::condition_variable runnable_cv;
+					std::condition_variable runnable_cv;
 					bool runnable;
 					PulsePrivate() :
 					  handle(0),
@@ -105,7 +105,7 @@ static void pulseaudio_callback(void* _userData) {
 }
 
 void audio::orchestra::api::Pulse::callbackEvent() {
-	etk::thread::setName("Pulse IO-" + m_name);
+	ethread::setName("Pulse IO-" + m_name);
 	while (m_private->threadRunning == true) {
 		callbackEventOneCycle();
 	}
@@ -134,7 +134,7 @@ enum audio::orchestra::error audio::orchestra::api::Pulse::closeStream() {
 
 void audio::orchestra::api::Pulse::callbackEventOneCycle() {
 	if (m_state == audio::orchestra::state_stopped) {
-		std11::unique_lock<std11::mutex> lck(m_mutex);
+		std::unique_lock<std::mutex> lck(m_mutex);
 		while (!m_private->runnable) {
 			m_private->runnable_cv.wait(lck);
 		}
@@ -396,7 +396,7 @@ bool audio::orchestra::api::Pulse::open(uint32_t _device,
 	}
 	if (m_private->threadRunning == false) {
 		m_private->threadRunning = true;
-		m_private->thread = std11::make_shared<std11::thread>(&pulseaudio_callback, this);
+		m_private->thread = std::make_shared<std::thread>(&pulseaudio_callback, this);
 		if (m_private->thread == nullptr) {
 			ATA_ERROR("error creating thread.");
 			goto error;
diff --git a/audio/orchestra/api/Pulse.h b/audio/orchestra/api/Pulse.h
index 842fba4..1d66fab 100644
--- a/audio/orchestra/api/Pulse.h
+++ b/audio/orchestra/api/Pulse.h
@@ -33,7 +33,7 @@ namespace audio {
 					void callbackEventOneCycle();
 					void callbackEvent();
 				private:
-					std11::shared_ptr<PulsePrivate> m_private;
+					std::shared_ptr<PulsePrivate> m_private;
 					std::vector<audio::orchestra::DeviceInfo> m_devices;
 					void saveDeviceInfo();
 					bool open(uint32_t _device,
diff --git a/audio/orchestra/debug.cpp b/audio/orchestra/debug.cpp
index 2da3f99..1252285 100644
--- a/audio/orchestra/debug.cpp
+++ b/audio/orchestra/debug.cpp
@@ -8,6 +8,6 @@
 #include <audio/orchestra/debug.h>
 
 int32_t audio::orchestra::getLogId() {
-	static int32_t g_val = etk::log::registerInstance("audio-orchestra");
+	static int32_t g_val = elog::registerInstance("audio-orchestra");
 	return g_val;
 }
diff --git a/audio/orchestra/debug.h b/audio/orchestra/debug.h
index 8a2ec69..49b2117 100644
--- a/audio/orchestra/debug.h
+++ b/audio/orchestra/debug.h
@@ -6,14 +6,14 @@
  */
 #pragma once
 
-#include <etk/log.h>
+#include <elog/log.h>
 
 namespace audio {
 	namespace orchestra {
 		int32_t getLogId();
 	}
 }
-#define ATA_BASE(info,data) TK_LOG_BASE(audio::orchestra::getLogId(),info,data)
+#define ATA_BASE(info,data) ELOG_BASE(audio::orchestra::getLogId(),info,data)
 
 #define ATA_PRINT(data)         ATA_BASE(-1, data)
 #define ATA_CRITICAL(data)      ATA_BASE(1, data)