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

[DEV] update sharedPtr

Browse Source
This commit is contained in:
Edouard DUPIN 2016-07-19 21:43:58 +02:00
parent 151a3ddcf4
commit db89c092be
24 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio/orchestra/Api.h
View File

@ -13,7 +13,7 @@
#include <audio/orchestra/mode.h>
#include <audio/Time.h>
#include <audio/Duration.h>
#include <memory>
#include <ememory/memory.h>
namespace audio {
namespace orchestra {
@ -45,7 +45,7 @@ namespace audio {
std::vector<int> outOffset;
};
class Api : public std::enable_shared_from_this<Api>{
class Api : public ememory::EnableSharedFromThis<Api>{
protected:
std::string m_name;
public:
@ -166,7 +166,7 @@ namespace audio {
uint32_t _firstChannel);
public:
virtual bool isMasterOf(std::shared_ptr<audio::orchestra::Api> _api) {
virtual bool isMasterOf(ememory::SharedPtr<audio::orchestra::Api> _api) {
return false;
};
};

4
audio/orchestra/Interface.cpp
View File

@ -80,8 +80,8 @@ audio::orchestra::Interface::Interface() :
#endif
}
void audio::orchestra::Interface::addInterface(const std::string& _api, std::shared_ptr<Api> (*_callbackCreate)()) {
m_apiAvaillable.push_back(std::pair<std::string, std::shared_ptr<Api> (*)()>(_api, _callbackCreate));
void audio::orchestra::Interface::addInterface(const std::string& _api, ememory::SharedPtr<Api> (*_callbackCreate)()) {
m_apiAvaillable.push_back(std::pair<std::string, ememory::SharedPtr<Api> (*)()>(_api, _callbackCreate));
}
enum audio::orchestra::error audio::orchestra::Interface::clear() {

6
audio/orchestra/Interface.h
View File

@ -26,9 +26,9 @@ namespace audio {
*/
class Interface {
protected:
std::vector<std::pair<std::string, std::shared_ptr<Api> (*)()> > m_apiAvaillable;
std::vector<std::pair<std::string, ememory::SharedPtr<Api> (*)()> > m_apiAvaillable;
protected:
std::shared_ptr<audio::orchestra::Api> m_api;
ememory::SharedPtr<audio::orchestra::Api> m_api;
public:
void setName(const std::string& _name) {
if (m_api == nullptr) {
@ -46,7 +46,7 @@ namespace audio {
* @param[in] _api Type of the interface.
* @param[in] _callbackCreate API creation callback.
*/
void addInterface(const std::string& _api, std::shared_ptr<Api> (*_callbackCreate)());
void addInterface(const std::string& _api, ememory::SharedPtr<Api> (*_callbackCreate)());
/**
* @brief The class constructor.
* @note the creating of the basic instance is done by Instanciate

10
audio/orchestra/api/Alsa.cpp
View File

@ -28,8 +28,8 @@ extern "C" {
#include <poll.h>
}
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Alsa::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Alsa());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Alsa::create() {
return ememory::SharedPtr<audio::orchestra::api::Alsa>(new audio::orchestra::api::Alsa());
}
namespace audio {
@ -63,7 +63,7 @@ namespace audio {
}
audio::orchestra::api::Alsa::Alsa() :
m_private(std::make_shared<audio::orchestra::api::AlsaPrivate>()) {
m_private(ememory::makeShared<audio::orchestra::api::AlsaPrivate>()) {
// Nothing to do here.
}
@ -1564,8 +1564,8 @@ unlock:
}
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);
bool audio::orchestra::api::Alsa::isMasterOf(ememory::SharedPtr<audio::orchestra::Api> _api) {
ememory::SharedPtr<audio::orchestra::api::Alsa> slave = ememory::dynamicPointerCast<audio::orchestra::api::Alsa>(_api);
if (slave == nullptr) {
ATA_ERROR("NULL ptr API (not ALSA ...)");
return false;

6
audio/orchestra/api/Alsa.h
View File

@ -14,7 +14,7 @@ namespace audio {
class AlsaPrivate;
class Alsa: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Alsa();
virtual ~Alsa();
@ -50,7 +50,7 @@ namespace audio {
private:
static void alsaCallbackEvent(void* _userData);
private:
std::shared_ptr<AlsaPrivate> m_private;
ememory::SharedPtr<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(std::shared_ptr<audio::orchestra::Api> _api);
bool isMasterOf(ememory::SharedPtr<audio::orchestra::Api> _api);
};
}
}

6
audio/orchestra/api/Android.cpp
View File

@ -15,9 +15,9 @@
#include <audio/orchestra/api/Android.h>
#include <limits.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Android::create() {
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Android::create() {
ATA_INFO("Create Android device ... ");
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Android());
return ememory::SharedPtr<audio::orchestra::api::Android>(new audio::orchestra::api::Android());
}
@ -145,7 +145,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, std::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, ememory::staticPointerCast<audio::orchestra::api::Android>(sharedFromThis()));
if (m_uid < 0) {
ret = false;
} else {

2
audio/orchestra/api/Android.h
View File

@ -14,7 +14,7 @@ namespace audio {
namespace api {
class Android: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Android();
virtual ~Android();

14
audio/orchestra/api/AndroidNativeInterface.cpp
View File

@ -14,7 +14,7 @@
/* include auto generated file */
#include <org_musicdsp_orchestra_OrchestraConstants.h>
#include <jvm-basics/jvm-basics.h>
#include <memory>
#include <ememory/memory.h>
#include <ejson/ejson.h>
class AndroidOrchestraContext {
@ -253,7 +253,7 @@ class AndroidOrchestraContext {
} else {
info.input = true;
}
std::shared_ptr<const ejson::Array> list = doc.getArray("sample-rate");
ememory::SharedPtr<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<std::weak_ptr<audio::orchestra::api::Android> > m_instanceList; // list of connected handle ...
std::vector<ememory::WeakPtr<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,
std::shared_ptr<audio::orchestra::api::Android> _instance) {
ememory::SharedPtr<audio::orchestra::api::Android> _instance) {
ATA_DEBUG("C->java : audio open device");
int status;
if(!java_attach_current_thread(&status)) {
@ -395,7 +395,7 @@ class AndroidOrchestraContext {
}
};
static std::shared_ptr<AndroidOrchestraContext> s_localContext;
static ememory::SharedPtr<AndroidOrchestraContext> s_localContext;
static int32_t s_nbContextRequested(0);
@ -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,
std::shared_ptr<audio::orchestra::api::Android> _instance) {
ememory::SharedPtr<audio::orchestra::api::Android> _instance) {
if (s_localContext == nullptr) {
return -1;
}
@ -468,7 +468,7 @@ extern "C" {
if (s_localContext != nullptr) {
s_nbContextRequested++;
}
s_localContext = std::make_shared<AndroidOrchestraContext>(_env, _classBase, _objCallback);
s_localContext = ememory::makeShared<AndroidOrchestraContext>(_env, _classBase, _objCallback);
if (s_localContext == nullptr) {
ATA_ERROR("Can not allocate the orchestra main context instance");
return;

4
audio/orchestra/api/AndroidNativeInterface.h
View File

@ -12,7 +12,7 @@
#include <audio/orchestra/error.h>
#include <audio/orchestra/StreamOptions.h>
#include <audio/format.h>
#include <memory>
#include <ememory/memory.h>
namespace audio {
namespace orchestra {
@ -29,7 +29,7 @@ namespace audio {
audio::format _format,
uint32_t *_bufferSize,
const audio::orchestra::StreamOptions& _options,
std::shared_ptr<audio::orchestra::api::Android> _instance);
ememory::SharedPtr<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);

4
audio/orchestra/api/Asio.cpp
View File

@ -11,8 +11,8 @@
#include <audio/orchestra/Interface.h>
#include <audio/orchestra/debug.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Asio::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Asio());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Asio::create() {
return ememory::SharedPtr<audio::orchestra::api::Asio>(new audio::orchestra::api::Asio());
}

4
audio/orchestra/api/Asio.h
View File

@ -13,7 +13,7 @@ namespace audio {
class AsioPrivate:
class Asio: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Asio();
virtual ~Asio();
@ -33,7 +33,7 @@ namespace audio {
// will most likely produce highly undesireable results!
bool callbackEvent(long _bufferIndex);
private:
std::shared_ptr<AsioPrivate> m_private;
ememory::SharedPtr<AsioPrivate> m_private;
std::vector<audio::orchestra::DeviceInfo> m_devices;
void saveDeviceInfo();
bool m_coInitialized;

4
audio/orchestra/api/Core.cpp
View File

@ -20,8 +20,8 @@
#include <ethread/tools.h>
#include <audio/orchestra/api/Core.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Core::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Core());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Core::create() {
return ememory::SharedPtr<audio::orchestra::api::Core>(new audio::orchestra::api::Core());
}
namespace audio {

4
audio/orchestra/api/Core.h
View File

@ -16,7 +16,7 @@ namespace audio {
class CorePrivate;
class Core: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Core();
virtual ~Core();
@ -46,7 +46,7 @@ namespace audio {
void* _infoPointer);
static void coreStopStream(void *_userData);
private:
std::shared_ptr<CorePrivate> m_private;
ememory::SharedPtr<CorePrivate> m_private;
bool open(uint32_t _device,
audio::orchestra::mode _mode,
uint32_t _channels,

4
audio/orchestra/api/CoreIos.h
View File

@ -13,7 +13,7 @@ namespace audio {
class CoreIosPrivate;
class CoreIos: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
CoreIos();
virtual ~CoreIos();
@ -47,7 +47,7 @@ namespace audio {
int32_t _nbChunk,
const audio::Time& _time);
public:
std::shared_ptr<CoreIosPrivate> m_private;
ememory::SharedPtr<CoreIosPrivate> m_private;
};
}
}

4
audio/orchestra/api/CoreIos.mm
View File

@ -16,9 +16,9 @@
#include <limits.h>
#include <audio/orchestra/api/CoreIos.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::CoreIos::create() {
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::CoreIos::create() {
ATA_INFO("Create CoreIos device ... ");
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::CoreIos());
return ememory::SharedPtr<audio::orchestra::api::CoreIos>(new audio::orchestra::api::CoreIos());
}
#define kOutputBus 0

8
audio/orchestra/api/Ds.cpp
View File

@ -12,8 +12,8 @@
#include <ethread/tools.h>
#include <audio/orchestra/api/Ds.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Ds::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Ds());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Ds::create() {
return ememory::SharedPtr<audio::orchestra::api::Ds>(new audio::orchestra::api::Ds());
}
@ -72,7 +72,7 @@ namespace audio {
namespace api {
class DsPrivate {
public:
std::shared_ptr<std::thread> thread;
ememory::SharedPtr<std::thread> thread;
bool threadRunning;
uint32_t drainCounter; // Tracks callback counts when draining
bool internalDrain; // Indicates if stop is initiated from callback or not.
@ -762,7 +762,7 @@ bool audio::orchestra::api::Ds::open(uint32_t _device,
// Setup the callback thread.
if (m_private->threadRunning == false) {
m_private->threadRunning = true;
std::shared_ptr<std::thread> tmpThread(new std::thread(&audio::orchestra::api::Ds::dsCallbackEvent, this));
ememory::SharedPtr<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!");

4
audio/orchestra/api/Ds.h
View File

@ -13,7 +13,7 @@ namespace audio {
class DsPrivate;
class Ds: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Ds();
virtual ~Ds();
@ -34,7 +34,7 @@ namespace audio {
void callbackEvent();
private:
static void dsCallbackEvent(void *_userData);
std::shared_ptr<DsPrivate> m_private;
ememory::SharedPtr<DsPrivate> m_private;
bool m_coInitialized;
bool m_buffersRolling;
long m_duplexPrerollBytes;

4
audio/orchestra/api/Dummy.cpp
View File

@ -9,8 +9,8 @@
#include <audio/orchestra/api/Dummy.h>
#include <audio/orchestra/debug.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Dummy::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Dummy());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Dummy::create() {
return ememory::SharedPtr<audio::orchestra::api::Dummy>(new audio::orchestra::api::Dummy());
}

2
audio/orchestra/api/Dummy.h
View File

@ -15,7 +15,7 @@ namespace audio {
namespace api {
class Dummy: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Dummy();
const std::string& getCurrentApi() {

4
audio/orchestra/api/Jack.cpp
View File

@ -16,8 +16,8 @@
#include <ethread/tools.h>
#include <audio/orchestra/api/Jack.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Jack::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Jack());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Jack::create() {
return ememory::SharedPtr<audio::orchestra::api::Jack>(new audio::orchestra::api::Jack());
}

4
audio/orchestra/api/Jack.h
View File

@ -15,7 +15,7 @@ namespace audio {
class JackPrivate;
class Jack: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Jack();
virtual ~Jack();
@ -40,7 +40,7 @@ namespace audio {
static void jackShutdown(void* _userData);
static int32_t jackCallbackHandler(jack_nframes_t _nframes, void* _userData);
private:
std::shared_ptr<JackPrivate> m_private;
ememory::SharedPtr<JackPrivate> m_private;
bool open(uint32_t _device,
audio::orchestra::mode _mode,
uint32_t _channels,

8
audio/orchestra/api/Pulse.cpp
View File

@ -19,8 +19,8 @@
#include <audio/orchestra/api/PulseDeviceList.h>
#include <audio/orchestra/api/Pulse.h>
std::shared_ptr<audio::orchestra::Api> audio::orchestra::api::Pulse::create() {
return std::shared_ptr<audio::orchestra::Api>(new audio::orchestra::api::Pulse());
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Pulse::create() {
return ememory::SharedPtr<audio::orchestra::api::Pulse>(new audio::orchestra::api::Pulse());
}
@ -53,7 +53,7 @@ namespace audio {
class PulsePrivate {
public:
pa_simple* handle;
std::shared_ptr<std::thread> thread;
ememory::SharedPtr<std::thread> thread;
bool threadRunning;
std::condition_variable runnable_cv;
bool runnable;
@ -393,7 +393,7 @@ bool audio::orchestra::api::Pulse::open(uint32_t _device,
}
if (m_private->threadRunning == false) {
m_private->threadRunning = true;
m_private->thread = std::make_shared<std::thread>(&pulseaudio_callback, this);
m_private->thread = ememory::makeShared<std::thread>(&pulseaudio_callback, this);
if (m_private->thread == nullptr) {
ATA_ERROR("error creating thread.");
goto error;

4
audio/orchestra/api/Pulse.h
View File

@ -13,7 +13,7 @@ namespace audio {
class PulsePrivate;
class Pulse: public audio::orchestra::Api {
public:
static std::shared_ptr<audio::orchestra::Api> create();
static ememory::SharedPtr<audio::orchestra::Api> create();
public:
Pulse();
virtual ~Pulse();
@ -33,7 +33,7 @@ namespace audio {
void callbackEventOneCycle();
void callbackEvent();
private:
std::shared_ptr<PulsePrivate> m_private;
ememory::SharedPtr<PulsePrivate> m_private;
std::vector<audio::orchestra::DeviceInfo> m_devices;
void saveDeviceInfo();
bool open(uint32_t _device,

2
audio/orchestra/base.h
View File

@ -11,7 +11,7 @@
#include <mutex>
#include <chrono>
#include <functional>
#include <memory>
#include <ememory/memory.h>
#include <audio/channel.h>
#include <audio/format.h>
#include <audio/orchestra/error.h>