musicdsp/audio-ess
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] update of external of elog and ethread

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-08 21:29:34 +01:00
parent 6fd08dcaf7
commit 0d1227ddd7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/ess/LoadedFile.cpp
View File

@ -8,7 +8,7 @@
#include <etk/types.h> #include <etk/types.h>
#include <etk/thread/tools.h> #include <ethread/tools.h>
#include <audio/ess/debug.h> #include <audio/ess/debug.h>
#include <audio/ess/LoadedFile.h> #include <audio/ess/LoadedFile.h>
#include <audio/ess/decWav.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) #if defined(__TARGET_OS__Android)
pthread_create(&m_thread, nullptr, &audio::ess::LoadedFile::threadCallback, this); pthread_create(&m_thread, nullptr, &audio::ess::LoadedFile::threadCallback, this);
#else #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) { if (m_thread == nullptr) {
EWOLSA_ERROR("Can not create thread ..."); EWOLSA_ERROR("Can not create thread ...");
return; return;

2
audio/ess/LoadedFile.h
View File

@ -23,7 +23,7 @@ namespace audio {
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
pthread_t m_thread; pthread_t m_thread;
#else #else
std11::shared_ptr<std11::thread> m_thread; std::shared_ptr<std::thread> m_thread;
#endif #endif
public: public:
LoadedFile(const std::string& _fileName, int8_t _nbChanRequested=1); LoadedFile(const std::string& _fileName, int8_t _nbChanRequested=1);

2
audio/ess/debug.cpp
View File

@ -9,6 +9,6 @@
#include <audio/ess/debug.h> #include <audio/ess/debug.h>
int32_t audio::ess::getLogId() { 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; return g_val;
} }

4
audio/ess/debug.h
View File

@ -7,7 +7,7 @@
*/ */
#pragma once #pragma once
#include <etk/log.h> #include <elog/log.h>
namespace audio { namespace audio {
@ -15,7 +15,7 @@ namespace audio {
int32_t getLogId(); 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_CRITICAL(data) EWOLSA_BASE(1, data)
#define EWOLSA_ERROR(data) EWOLSA_BASE(2, data) #define EWOLSA_ERROR(data) EWOLSA_BASE(2, data)

2
audio/ess/ess.cpp
View File

@ -37,7 +37,7 @@ void audio::ess::unInit() {
void audio::ess::soundSetParse(const std::string& _data) { void audio::ess::soundSetParse(const std::string& _data) {
ejson::Document doc; ejson::Document doc;
doc.parse(_data); doc.parse(_data);
std11::shared_ptr<ejson::Object> obj = doc.getObject("musics"); std::shared_ptr<ejson::Object> obj = doc.getObject("musics");
if ( obj != nullptr if ( obj != nullptr
&& g_music != nullptr) { && g_music != nullptr) {
for (auto &it : obj->getKeys()) { for (auto &it : obj->getKeys()) {