From 404fc89275089aedaf38fbb9ed1c04bffa85e5e8 Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Fri, 26 Jun 2015 16:32:58 +0200
Subject: [PATCH] [DEV] correct android multithreading

---
 audio/ess/LoadedFile.cpp | 50 +++++++++++++++++++++++++++++-----------
 audio/ess/LoadedFile.h   | 13 ++++++++---
 audio/ess/decOgg.cpp     |  8 +++----
 3 files changed, 50 insertions(+), 21 deletions(-)

diff --git a/audio/ess/LoadedFile.cpp b/audio/ess/LoadedFile.cpp
index 7fbac00..ce10f97 100644
--- a/audio/ess/LoadedFile.cpp
+++ b/audio/ess/LoadedFile.cpp
@@ -15,21 +15,33 @@
 #include <audio/ess/decOgg.h>
 #include <unistd.h>
 
-static void threadCallback2(void* _userData) {
+#if defined(__TARGET_OS__Android)
+	static void* threadCallback2(void* _userData) {
+#else
+	static void threadCallback2(void* _userData) {
+#endif
 	etk::thread::setName("ewolSA decoder");
 	audio::ess::LoadedFile* decodeFile = static_cast<audio::ess::LoadedFile*>(_userData);
 	if (decodeFile != nullptr) {
 		decodeFile->decode();
 	}
+	
+	#if defined(__TARGET_OS__Android)
+		return nullptr;
+	#endif
 }
 
 void audio::ess::LoadedFile::decode() {
+	EWOLSA_INFO("Start decode OGG : " << m_file);
 	m_data = audio::ess::ogg::loadAudioFile(m_file, m_nbChanRequested);
 	m_nbSamples = m_data.size();
+	EWOLSA_INFO("End decode OGG : " << m_file << " size=" << m_nbSamples);
 }
 
 audio::ess::LoadedFile::LoadedFile(const std::string& _fileName, int8_t _nbChanRequested) :
-  m_thread(nullptr),
+  #if !defined(__TARGET_OS__Android)
+  	m_thread(nullptr),
+  #endif
   m_file(_fileName),
   m_nbSamples(0),
   m_nbChanRequested(_nbChanRequested),
@@ -40,15 +52,21 @@ audio::ess::LoadedFile::LoadedFile(const std::string& _fileName, int8_t _nbChanR
 		m_data = audio::ess::wav::loadAudioFile(m_file, m_nbChanRequested);
 		m_nbSamples = m_data.size();
 	} else if (etk::end_with(tmpName, ".ogg") == true) {
-		/*
-		EWOLSA_DEBUG("create thread");
-		m_thread = new std::thread(&threadCallback2, this);
-		EWOLSA_DEBUG("done 1");
-		std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-		EWOLSA_DEBUG("done 2");
-		*/
-		// TODO: Set this back to have music decode();
-		// TODO: This is removed to test faster ==> pb on android to create thread ...
+		#if 1
+			EWOLSA_DEBUG("create thread");
+			#if defined(__TARGET_OS__Android)
+				pthread_create(&m_thread, nullptr, &threadCallback2, this);
+			#else
+				m_thread = new std::thread(&threadCallback2, this);
+			#endif
+			EWOLSA_DEBUG("done 1");
+			std::this_thread::sleep_for(std::chrono::milliseconds(100));
+			EWOLSA_DEBUG("done 2");
+		#else
+			EWOLSA_DEBUG("done 1");
+			decode();
+			EWOLSA_DEBUG("done 2");
+		#endif
 	} else {
 		EWOLSA_ERROR("Extention not managed '" << m_file << "' Sopported extention : .wav / .ogg");
 		return;
@@ -63,9 +81,13 @@ audio::ess::LoadedFile::LoadedFile(const std::string& _fileName, int8_t _nbChanR
 
 
 audio::ess::LoadedFile::~LoadedFile() {
-	if (m_thread != nullptr) {
-		delete m_thread;
-	}
+	#if defined(__TARGET_OS__Android)
+		// TODO : ...
+	#else
+		if (m_thread != nullptr) {
+			delete m_thread;
+		}
+	#endif
 }
 
 
diff --git a/audio/ess/LoadedFile.h b/audio/ess/LoadedFile.h
index 027bad5..0394c62 100644
--- a/audio/ess/LoadedFile.h
+++ b/audio/ess/LoadedFile.h
@@ -11,14 +11,21 @@
 #define __EWOLSA_LOADED_FILE_H__
 
 #include <etk/types.h>
-#include <thread>
-#include <pthread.h>
+#if defined(__TARGET_OS__Android)
+	#include <pthread.h>
+#else
+	#include <thread>
+#endif
 
 namespace audio {
 	namespace ess {
 		class LoadedFile {
 			private:
-				std::thread* m_thread;
+				#if defined(__TARGET_OS__Android)
+					pthread_t m_thread;
+				#else
+					std::thread* m_thread;
+				#endif
 			public:
 				LoadedFile(const std::string& _fileName, int8_t _nbChanRequested=1);
 				~LoadedFile();
diff --git a/audio/ess/decOgg.cpp b/audio/ess/decOgg.cpp
index 8870d49..c2215d4 100644
--- a/audio/ess/decOgg.cpp
+++ b/audio/ess/decOgg.cpp
@@ -62,20 +62,20 @@ std::vector<int16_t> audio::ess::ogg::loadAudioFile(const std::string& _filename
 	// Start loading the XML : 
 	//EWOLSA_DEBUG("open file (OGG) \"" << fileAccess << "\"");
 	if (false == fileAccess->exist()) {
-		//EWOLSA_ERROR("File Does not exist : \"" << fileAccess << "\"");
+		EWOLSA_ERROR("File Does not exist : \"" << *fileAccess << "\"");
 		return std::vector<int16_t>();
 	}
 	int32_t fileSize = fileAccess->fileSize();
 	if (0 == fileSize) {
-		//EWOLSA_ERROR("This file is empty : \"" << fileAccess << "\"");
+		EWOLSA_ERROR("This file is empty : \"" << *fileAccess << "\"");
 		return std::vector<int16_t>();
 	}
 	if (false == fileAccess->fileOpenRead()) {
-		//EWOLSA_ERROR("Can not open the file : \"" << fileAccess << "\"");
+		EWOLSA_ERROR("Can not open the file : \"" << *fileAccess << "\"");
 		return std::vector<int16_t>();
 	}
 	if (ov_open_callbacks(&(*fileAccess), &vf, nullptr, 0, tmpCallback) < 0) {
-		//EWOLSA_ERROR("Input does not appear to be an Ogg bitstream.");
+		EWOLSA_ERROR("Input does not appear to be an Ogg bitstream.");
 		return std::vector<int16_t>();
 	}
 	vorbis_info *vi=ov_info(&vf,-1);