From 0b8c0e3fd4a92cdf1b3eff96238cd59916574e3e Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Sat, 21 Oct 2017 19:05:21 +0200
Subject: [PATCH] [DEV] update to the new ETK allocator wrapper

---
 audio/orchestra/api/Alsa.cpp    |  4 ++--
 audio/orchestra/api/Android.cpp |  2 +-
 audio/orchestra/api/Asio.cpp    |  4 ++--
 audio/orchestra/api/Core.cpp    |  6 +++---
 audio/orchestra/api/CoreIos.mm  |  4 ++--
 audio/orchestra/api/Ds.cpp      |  6 +++---
 audio/orchestra/api/Dummy.cpp   |  2 +-
 audio/orchestra/api/Jack.cpp    | 10 +++++-----
 audio/orchestra/api/Pulse.cpp   |  4 ++--
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/audio/orchestra/api/Alsa.cpp b/audio/orchestra/api/Alsa.cpp
index fe7f438..8653175 100644
--- a/audio/orchestra/api/Alsa.cpp
+++ b/audio/orchestra/api/Alsa.cpp
@@ -29,7 +29,7 @@ extern "C" {
 }
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Alsa::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Alsa>(new audio::orchestra::api::Alsa());
+	return ememory::SharedPtr<audio::orchestra::api::Alsa>(ETK_NEW(audio::orchestra::api::Alsa));
 }
 
 namespace audio {
@@ -801,7 +801,7 @@ bool audio::orchestra::api::Alsa::openName(const etk::String& _deviceName,
 	// Setup callback thread.
 	m_private->threadRunning = true;
 	ATA_INFO("create thread ...");
-	m_private->thread = new ethread::Thread([=]() {callbackEvent();});
+	m_private->thread = ETK_NEW(ethread::Thread, [=]() {callbackEvent();});
 	if (m_private->thread == nullptr) {
 		m_private->threadRunning = false;
 		ATA_ERROR("creating callback thread!");
diff --git a/audio/orchestra/api/Android.cpp b/audio/orchestra/api/Android.cpp
index d585463..550b295 100644
--- a/audio/orchestra/api/Android.cpp
+++ b/audio/orchestra/api/Android.cpp
@@ -19,7 +19,7 @@ extern "C" {
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Android::create() {
 	ATA_INFO("Create Android device ... ");
-	return ememory::SharedPtr<audio::orchestra::api::Android>(new audio::orchestra::api::Android());
+	return ememory::SharedPtr<audio::orchestra::api::Android>(ETK_NEW(audio::orchestra::api::Android));
 }
 
 
diff --git a/audio/orchestra/api/Asio.cpp b/audio/orchestra/api/Asio.cpp
index 6ea5a0e..5837c0b 100644
--- a/audio/orchestra/api/Asio.cpp
+++ b/audio/orchestra/api/Asio.cpp
@@ -12,7 +12,7 @@
 #include <audio/orchestra/debug.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Asio::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Asio>(new audio::orchestra::api::Asio());
+	return ememory::SharedPtr<audio::orchestra::api::Asio>(ETK_NEW(audio::orchestra::api::Asio));
 }
 
 
@@ -71,7 +71,7 @@ static void sampleRateChanged(ASIOSampleRate _sRate);
 static long asioMessages(long _selector, long _value, void* _message, double* _opt);
 
 audio::orchestra::api::Asio::Asio() :
-  m_private(new audio::orchestra::api::AsioPrivate()) {
+  m_private(ETK_NEW(audio::orchestra::api::AsioPrivate)) {
 	// ASIO cannot run on a multi-threaded appartment. You can call
 	// CoInitialize beforehand, but it must be for appartment threading
 	// (in which case, CoInitilialize will return S_FALSE here).
diff --git a/audio/orchestra/api/Core.cpp b/audio/orchestra/api/Core.cpp
index 7f2d778..b774832 100644
--- a/audio/orchestra/api/Core.cpp
+++ b/audio/orchestra/api/Core.cpp
@@ -21,7 +21,7 @@
 #include <audio/orchestra/api/Core.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Core::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Core>(new audio::orchestra::api::Core());
+	return ememory::SharedPtr<audio::orchestra::api::Core>(ETK_NEW(audio::orchestra::api::Core));
 }
 
 namespace audio {
@@ -57,7 +57,7 @@ namespace audio {
 }
 
 audio::orchestra::api::Core::Core() :
-  m_private(new audio::orchestra::api::CorePrivate()) {
+  m_private(ETK_NEW(audio::orchestra::api::CorePrivate)) {
 #if defined(AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER)
 	// This is a largely undocumented but absolutely necessary
 	// requirement starting with OS-X 10.6.	If not called, queries and
@@ -1036,7 +1036,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 ethread::Thread(&audio::orchestra::api::Core::coreStopStream, this);
+			ETK_NEW(ethread::Thread, &audio::orchestra::api::Core::coreStopStream, this);
 		} else {
 			// external call to stopStream()
 			m_private->m_semaphore.post();
diff --git a/audio/orchestra/api/CoreIos.mm b/audio/orchestra/api/CoreIos.mm
index 0e64525..291a390 100644
--- a/audio/orchestra/api/CoreIos.mm
+++ b/audio/orchestra/api/CoreIos.mm
@@ -20,7 +20,7 @@ extern "C" {
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::CoreIos::create() {
 	ATA_INFO("Create CoreIos device ... ");
-	return ememory::SharedPtr<audio::orchestra::api::CoreIos>(new audio::orchestra::api::CoreIos());
+	return ememory::SharedPtr<audio::orchestra::api::CoreIos>(ETK_NEW(audio::orchestra::api::CoreIos));
 }
 
 #define kOutputBus 0
@@ -40,7 +40,7 @@ namespace audio {
 
 
 audio::orchestra::api::CoreIos::CoreIos() :
-  m_private(new audio::orchestra::api::CoreIosPrivate()) {
+  m_private(ETK_NEW(audio::orchestra::api::CoreIosPrivate)) {
 	ATA_INFO("new CoreIos");
 	int32_t deviceCount = 2;
 	ATA_ERROR("Get count devices : " << 2);
diff --git a/audio/orchestra/api/Ds.cpp b/audio/orchestra/api/Ds.cpp
index 35ba10b..6a35b30 100644
--- a/audio/orchestra/api/Ds.cpp
+++ b/audio/orchestra/api/Ds.cpp
@@ -13,7 +13,7 @@
 #include <audio/orchestra/api/Ds.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Ds::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Ds>(new audio::orchestra::api::Ds());
+	return ememory::SharedPtr<audio::orchestra::api::Ds>(ETK_NEW(audio::orchestra::api::Ds));
 }
 
 
@@ -110,7 +110,7 @@ struct DsProbeData {
 };
 
 audio::orchestra::api::Ds::Ds() :
-  m_private(new audio::orchestra::api::DsPrivate()) {
+  m_private(ETK_NEW(audio::orchestra::api::DsPrivate)) {
 	// Dsound will run both-threaded. If CoInitialize fails, then just
 	// accept whatever the mainline chose for a threading model.
 	m_coInitialized = false;
@@ -761,7 +761,7 @@ bool audio::orchestra::api::Ds::open(uint32_t _device,
 	// Setup the callback thread.
 	if (m_private->threadRunning == false) {
 		m_private->threadRunning = true;
-		ememory::SharedPtr<ethread::Thread> tmpThread(new ethread::Thread([=](){audio::orchestra::api::Ds::dsCallbackEvent();});
+		ememory::SharedPtr<ethread::Thread> tmpThread(ETK_NEW(ethread::Thread, [=](){audio::orchestra::api::Ds::dsCallbackEvent();});
 		m_private->thread =	etk::move(tmpThread);
 		if (m_private->thread == nullptr) {
 			ATA_ERROR("error creating callback thread!");
diff --git a/audio/orchestra/api/Dummy.cpp b/audio/orchestra/api/Dummy.cpp
index bd351f4..9e98af7 100644
--- a/audio/orchestra/api/Dummy.cpp
+++ b/audio/orchestra/api/Dummy.cpp
@@ -10,7 +10,7 @@
 #include <audio/orchestra/debug.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Dummy::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Dummy>(new audio::orchestra::api::Dummy());
+	return ememory::SharedPtr<audio::orchestra::api::Dummy>(ETK_NEW(audio::orchestra::api::Dummy));
 }
 
 
diff --git a/audio/orchestra/api/Jack.cpp b/audio/orchestra/api/Jack.cpp
index ec38775..f3fca01 100644
--- a/audio/orchestra/api/Jack.cpp
+++ b/audio/orchestra/api/Jack.cpp
@@ -17,7 +17,7 @@ extern "C" {
 #include <audio/orchestra/api/Jack.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Jack::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Jack>(new audio::orchestra::api::Jack());
+	return ememory::SharedPtr<audio::orchestra::api::Jack>(ETK_NEW(audio::orchestra::api::Jack));
 }
 
 
@@ -84,7 +84,7 @@ namespace audio {
 }
 
 audio::orchestra::api::Jack::Jack() :
-  m_private(new audio::orchestra::api::JackPrivate()) {
+  m_private(ETK_NEW(audio::orchestra::api::JackPrivate)) {
 	// Nothing to do here.
 }
 
@@ -235,7 +235,7 @@ void audio::orchestra::api::Jack::jackShutdown(void* _userData) {
 	if (myClass->isStreamRunning() == false) {
 		return;
 	}
-	new ethread::Thread([=](){myClass->closeStream();});
+	ETK_NEW(ethread::Thread, [=](){myClass->closeStream();});
 	ATA_ERROR("The Jack server is shutting down this client ... stream stopped and closed!!");
 }
 
@@ -626,7 +626,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 ethread::Thread([&](){stopStream();}, "Jack_stopStream");
+			ETK_NEW(ethread::Thread, [&](){stopStream();}, "Jack_stopStream");
 		} else {
 			m_private->m_semaphore.post();
 		}
@@ -653,7 +653,7 @@ bool audio::orchestra::api::Jack::callbackEvent(uint64_t _nframes) {
 		if (cbReturnValue == 2) {
 			m_state = audio::orchestra::state::stopping;
 			m_private->drainCounter = 2;
-			new ethread::Thread([&](){stopStream();}, "Jack_stopStream2");
+			ETK_NEW(ethread::Thread, [&](){stopStream();}, "Jack_stopStream2");
 			return true;
 		}
 		else if (cbReturnValue == 1) {
diff --git a/audio/orchestra/api/Pulse.cpp b/audio/orchestra/api/Pulse.cpp
index 5a23774..c9cc554 100644
--- a/audio/orchestra/api/Pulse.cpp
+++ b/audio/orchestra/api/Pulse.cpp
@@ -21,7 +21,7 @@ extern "C" {
 #include <audio/orchestra/api/Pulse.hpp>
 
 ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Pulse::create() {
-	return ememory::SharedPtr<audio::orchestra::api::Pulse>(new audio::orchestra::api::Pulse());
+	return ememory::SharedPtr<audio::orchestra::api::Pulse>(ETK_NEW(audio::orchestra::api::Pulse));
 }
 
 
@@ -69,7 +69,7 @@ namespace audio {
 	}
 }
 audio::orchestra::api::Pulse::Pulse() :
-  m_private(new audio::orchestra::api::PulsePrivate()) {
+  m_private(ETK_NEW(audio::orchestra::api::PulsePrivate)) {
 	
 }