From 0d1227ddd7323e37495af024c6ec2cd04ec64089 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/ess/LoadedFile.cpp | 4 ++--
 audio/ess/LoadedFile.h   | 2 +-
 audio/ess/debug.cpp      | 2 +-
 audio/ess/debug.h        | 4 ++--
 audio/ess/ess.cpp        | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/audio/ess/LoadedFile.cpp b/audio/ess/LoadedFile.cpp
index 7a2cec0..adcdedc 100644
--- a/audio/ess/LoadedFile.cpp
+++ b/audio/ess/LoadedFile.cpp
@@ -8,7 +8,7 @@
 
 
 #include <etk/types.h>
-#include <etk/thread/tools.h>
+#include <ethread/tools.h>
 #include <audio/ess/debug.h>
 #include <audio/ess/LoadedFile.h>
 #include <audio/ess/decWav.h>
@@ -55,7 +55,7 @@ audio::ess::LoadedFile::LoadedFile(const std::string& _fileName, int8_t _nbChanR
 			#if defined(__TARGET_OS__Android)
 				pthread_create(&m_thread, nullptr, &audio::ess::LoadedFile::threadCallback, this);
 			#else
-				m_thread = std11::make_shared<std11::thread>(&audio::ess::LoadedFile::threadCall, this);
+				m_thread = std::make_shared<std::thread>(&audio::ess::LoadedFile::threadCall, this);
 				if (m_thread == nullptr) {
 					EWOLSA_ERROR("Can not create thread ...");
 					return;
diff --git a/audio/ess/LoadedFile.h b/audio/ess/LoadedFile.h
index 2016a28..d5061cc 100644
--- a/audio/ess/LoadedFile.h
+++ b/audio/ess/LoadedFile.h
@@ -23,7 +23,7 @@ namespace audio {
 				#if defined(__TARGET_OS__Android)
 					pthread_t m_thread;
 				#else
-					std11::shared_ptr<std11::thread> m_thread;
+					std::shared_ptr<std::thread> m_thread;
 				#endif
 			public:
 				LoadedFile(const std::string& _fileName, int8_t _nbChanRequested=1);
diff --git a/audio/ess/debug.cpp b/audio/ess/debug.cpp
index 4325367..ac63edc 100644
--- a/audio/ess/debug.cpp
+++ b/audio/ess/debug.cpp
@@ -9,6 +9,6 @@
 #include <audio/ess/debug.h>
 
 int32_t audio::ess::getLogId() {
-	static int32_t g_val = etk::log::registerInstance("audio-ess");
+	static int32_t g_val = elog::registerInstance("audio-ess");
 	return g_val;
 }
diff --git a/audio/ess/debug.h b/audio/ess/debug.h
index 25da265..d953eb6 100644
--- a/audio/ess/debug.h
+++ b/audio/ess/debug.h
@@ -7,7 +7,7 @@
  */
 #pragma once
 
-#include <etk/log.h>
+#include <elog/log.h>
 
 
 namespace audio {
@@ -15,7 +15,7 @@ namespace audio {
 		int32_t getLogId();
 	}
 }
-#define EWOLSA_BASE(info,data) TK_LOG_BASE(audio::ess::getLogId(),info,data)
+#define EWOLSA_BASE(info,data) ELOG_BASE(audio::ess::getLogId(),info,data)
 
 #define EWOLSA_CRITICAL(data)      EWOLSA_BASE(1, data)
 #define EWOLSA_ERROR(data)         EWOLSA_BASE(2, data)
diff --git a/audio/ess/ess.cpp b/audio/ess/ess.cpp
index 1231dd4..1e6c26c 100644
--- a/audio/ess/ess.cpp
+++ b/audio/ess/ess.cpp
@@ -37,7 +37,7 @@ void audio::ess::unInit() {
 void audio::ess::soundSetParse(const std::string& _data) {
 	ejson::Document doc;
 	doc.parse(_data);
-	std11::shared_ptr<ejson::Object> obj = doc.getObject("musics");
+	std::shared_ptr<ejson::Object> obj = doc.getObject("musics");
 	if (    obj != nullptr
 	     && g_music != nullptr) {
 		for (auto &it : obj->getKeys()) {