musicdsp/audio-algo-drain
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 bbe6c0b924
commit 7da4f477aa
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/algo/drain/BiQuad.h
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <memory> #include <ememory/memory.h>
#include <etk/types.h> #include <etk/types.h>
#include <audio/algo/drain/BiQuadType.h> #include <audio/algo/drain/BiQuadType.h>
#include <cmath> #include <cmath>

2
audio/algo/drain/BiQuadType.h
View File

@ -5,7 +5,7 @@
*/ */
#pragma once #pragma once
#include <memory> #include <ememory/memory.h>
namespace audio { namespace audio {
namespace algo { namespace algo {

20
audio/algo/drain/Equalizer.cpp
View File

@ -185,7 +185,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_double: case audio::format_double:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::double_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::double_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -195,7 +195,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_float: case audio::format_float:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::float_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::float_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -205,7 +205,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int8: case audio::format_int8:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int8_8_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int8_8_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -215,7 +215,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int8_on_int16: case audio::format_int8_on_int16:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int8_16_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int8_16_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -225,7 +225,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int16: case audio::format_int16:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int16_16_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int16_16_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -235,7 +235,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int16_on_int32: case audio::format_int16_on_int32:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int16_32_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int16_32_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -245,7 +245,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int24_on_int32: case audio::format_int24_on_int32:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int24_32_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int24_32_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -255,7 +255,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int32: case audio::format_int32:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int32_32_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int32_32_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -265,7 +265,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int32_on_int64: case audio::format_int32_on_int64:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int32_64_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int32_64_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;
@ -275,7 +275,7 @@ void audio::algo::drain::Equalizer::init(float _sampleRate, int8_t _nbChannel, e
break; break;
case audio::format_int64: case audio::format_int64:
{ {
m_private = std::make_shared<EqualizerPrivateType<audio::int32_64_t> >(); m_private = ememory::makeShared<EqualizerPrivateType<audio::int32_64_t> >();
if (m_private == nullptr) { if (m_private == nullptr) {
AA_DRAIN_ERROR("can not allocate private data..."); AA_DRAIN_ERROR("can not allocate private data...");
return; return;

4
audio/algo/drain/Equalizer.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.h>
#include <memory> #include <ememory/memory.h>
#include <vector> #include <vector>
#include <audio/format.h> #include <audio/format.h>
#include <audio/algo/drain/BiQuadType.h> #include <audio/algo/drain/BiQuadType.h>
@ -74,7 +74,7 @@ namespace audio {
// for debug & tools only // for debug & tools only
std::vector<std::pair<float,float> > calculateTheory(); std::vector<std::pair<float,float> > calculateTheory();
protected: protected:
std::shared_ptr<EqualizerPrivate> m_private; //!< private data (abstract the type of the data flow). ememory::SharedPtr<EqualizerPrivate> m_private; //!< private data (abstract the type of the data flow).
}; };
} }
} }