[STYLE] remove (void) in () to be c++ coherent
This commit is contained in:
parent
28982a1bbd
commit
18c2370065
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::GeneratorFile::GeneratorFile(void) :
|
eaudiofx::GeneratorFile::GeneratorFile() :
|
||||||
m_file(NULL) {
|
m_file(NULL) {
|
||||||
// set output :
|
// set output :
|
||||||
m_io.insert(
|
m_io.insert(
|
||||||
@ -53,7 +53,7 @@ int32_t eaudiofx::GeneratorFile::pull(double _currentTime, int32_t _request, flo
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::GeneratorFile::init(void) {
|
int32_t eaudiofx::GeneratorFile::init() {
|
||||||
m_file = new etk::FSNode("DATA:menu.wav");
|
m_file = new etk::FSNode("DATA:menu.wav");
|
||||||
if (m_file == NULL) {
|
if (m_file == NULL) {
|
||||||
EAUDIOFX_ERROR("Can not allocate the input file ...");
|
EAUDIOFX_ERROR("Can not allocate the input file ...");
|
||||||
@ -67,7 +67,7 @@ int32_t eaudiofx::GeneratorFile::init(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::GeneratorFile::unInit(void) {
|
int32_t eaudiofx::GeneratorFile::unInit() {
|
||||||
if (m_file == NULL) {
|
if (m_file == NULL) {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
}
|
}
|
||||||
|
@ -15,14 +15,14 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class GeneratorFile : public eaudiofx::BlockGenerator {
|
class GeneratorFile : public eaudiofx::BlockGenerator {
|
||||||
public:
|
public:
|
||||||
GeneratorFile(void);
|
GeneratorFile();
|
||||||
virtual ~GeneratorFile(void) {};
|
virtual ~GeneratorFile() {};
|
||||||
protected:
|
protected:
|
||||||
etk::FSNode* m_file;
|
etk::FSNode* m_file;
|
||||||
public: // herieted function :
|
public: // herieted function :
|
||||||
virtual int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
virtual int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
||||||
virtual int32_t init(void);
|
virtual int32_t init();
|
||||||
virtual int32_t unInit(void);
|
virtual int32_t unInit();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include <eaudiofx/core/BufferAudioRaw.h>
|
#include <eaudiofx/core/BufferAudioRaw.h>
|
||||||
#include <airtaudio/Interface.h>
|
#include <airtaudio/Interface.h>
|
||||||
|
|
||||||
eaudiofx::GeneratorRtAudio::GeneratorRtAudio(void) {
|
eaudiofx::GeneratorRtAudio::GeneratorRtAudio() {
|
||||||
setLive(true);
|
setLive(true);
|
||||||
// set output :
|
// set output :
|
||||||
m_io.insert(
|
m_io.insert(
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class GeneratorRtAudio : public eaudiofx::BlockGenerator {
|
class GeneratorRtAudio : public eaudiofx::BlockGenerator {
|
||||||
public:
|
public:
|
||||||
GeneratorRtAudio(void);
|
GeneratorRtAudio();
|
||||||
virtual ~GeneratorRtAudio(void) {};
|
virtual ~GeneratorRtAudio() {};
|
||||||
public:
|
public:
|
||||||
int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
||||||
};
|
};
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::GeneratorSignal::GeneratorSignal(void) :
|
eaudiofx::GeneratorSignal::GeneratorSignal() :
|
||||||
m_phase(0) {
|
m_phase(0) {
|
||||||
// set output :
|
// set output :
|
||||||
m_io.insert(
|
m_io.insert(
|
||||||
|
@ -16,8 +16,8 @@ namespace eaudiofx {
|
|||||||
protected:
|
protected:
|
||||||
float m_phase;
|
float m_phase;
|
||||||
public:
|
public:
|
||||||
GeneratorSignal(void);
|
GeneratorSignal();
|
||||||
virtual ~GeneratorSignal(void) {};
|
virtual ~GeneratorSignal() {};
|
||||||
public:
|
public:
|
||||||
int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
||||||
};
|
};
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class ReceiverFile : public eaudiofx::BlockReceiver {
|
class ReceiverFile : public eaudiofx::BlockReceiver {
|
||||||
public:
|
public:
|
||||||
ReceiverFile(void) {};
|
ReceiverFile() {};
|
||||||
virtual ~ReceiverFile(void) {};
|
virtual ~ReceiverFile() {};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ int32_t eaudiofx::ReceiverRtAudio::needData(float* _outputBuffer,
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::ReceiverRtAudio::ReceiverRtAudio(void) :
|
eaudiofx::ReceiverRtAudio::ReceiverRtAudio() :
|
||||||
m_processStarted(false) {
|
m_processStarted(false) {
|
||||||
setLive(true);
|
setLive(true);
|
||||||
// set output :
|
// set output :
|
||||||
@ -92,7 +92,7 @@ eaudiofx::ReceiverRtAudio::ReceiverRtAudio(void) :
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::ReceiverRtAudio::init(void) {
|
int32_t eaudiofx::ReceiverRtAudio::init() {
|
||||||
EAUDIOFX_DEBUG("Intanciat AirTAudio Interface ...");
|
EAUDIOFX_DEBUG("Intanciat AirTAudio Interface ...");
|
||||||
m_dac.instanciate();
|
m_dac.instanciate();
|
||||||
EAUDIOFX_DEBUG("Create RTAudio receiver ...");
|
EAUDIOFX_DEBUG("Create RTAudio receiver ...");
|
||||||
@ -114,7 +114,7 @@ int32_t eaudiofx::ReceiverRtAudio::init(void) {
|
|||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
|
|
||||||
int32_t eaudiofx::ReceiverRtAudio::unInit(void) {
|
int32_t eaudiofx::ReceiverRtAudio::unInit() {
|
||||||
EAUDIOFX_DEBUG("un-init Stream ...");
|
EAUDIOFX_DEBUG("un-init Stream ...");
|
||||||
// Stop the stream
|
// Stop the stream
|
||||||
m_dac.stopStream();
|
m_dac.stopStream();
|
||||||
@ -126,13 +126,13 @@ int32_t eaudiofx::ReceiverRtAudio::unInit(void) {
|
|||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
|
|
||||||
int32_t eaudiofx::ReceiverRtAudio::start(void) {
|
int32_t eaudiofx::ReceiverRtAudio::start() {
|
||||||
EAUDIOFX_DEBUG("Start stream ...");
|
EAUDIOFX_DEBUG("Start stream ...");
|
||||||
m_processStarted = true;
|
m_processStarted = true;
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
|
|
||||||
int32_t eaudiofx::ReceiverRtAudio::stop(void) {
|
int32_t eaudiofx::ReceiverRtAudio::stop() {
|
||||||
EAUDIOFX_DEBUG("Stop Stream ...");
|
EAUDIOFX_DEBUG("Stop Stream ...");
|
||||||
m_processStarted = false;
|
m_processStarted = false;
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
|
@ -27,16 +27,16 @@ namespace eaudiofx {
|
|||||||
double _streamTime,
|
double _streamTime,
|
||||||
airtaudio::streamStatus _status);
|
airtaudio::streamStatus _status);
|
||||||
public:
|
public:
|
||||||
ReceiverRtAudio(void);
|
ReceiverRtAudio();
|
||||||
virtual ~ReceiverRtAudio(void) {};
|
virtual ~ReceiverRtAudio() {};
|
||||||
public: // herieted function :
|
public: // herieted function :
|
||||||
virtual int32_t init(void);
|
virtual int32_t init();
|
||||||
virtual int32_t unInit(void);
|
virtual int32_t unInit();
|
||||||
private:
|
private:
|
||||||
bool m_processStarted;
|
bool m_processStarted;
|
||||||
public:
|
public:
|
||||||
virtual int32_t start(void);
|
virtual int32_t start();
|
||||||
virtual int32_t stop(void);
|
virtual int32_t stop();
|
||||||
protected:
|
protected:
|
||||||
airtaudio::Interface m_dac;
|
airtaudio::Interface m_dac;
|
||||||
airtaudio::StreamParameters m_parameters;
|
airtaudio::StreamParameters m_parameters;
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::Block::Block(void) :
|
eaudiofx::Block::Block() :
|
||||||
m_uid(0),
|
m_uid(0),
|
||||||
m_type(),
|
m_type(),
|
||||||
m_parent(NULL) {
|
m_parent(NULL) {
|
||||||
@ -22,7 +22,7 @@ eaudiofx::Block::Block(void) :
|
|||||||
id++;
|
id++;
|
||||||
}
|
}
|
||||||
|
|
||||||
eaudiofx::Block::~Block(void) {
|
eaudiofx::Block::~Block() {
|
||||||
for (auto &it : m_io) {
|
for (auto &it : m_io) {
|
||||||
if (it.second.m_buffer == NULL) {
|
if (it.second.m_buffer == NULL) {
|
||||||
continue;
|
continue;
|
||||||
|
@ -27,8 +27,8 @@ namespace eaudiofx {
|
|||||||
};
|
};
|
||||||
class Block {
|
class Block {
|
||||||
public:
|
public:
|
||||||
Block(void);
|
Block();
|
||||||
virtual ~Block(void);
|
virtual ~Block();
|
||||||
protected:
|
protected:
|
||||||
std::mutex m_mutex; //!< Block mutex access
|
std::mutex m_mutex; //!< Block mutex access
|
||||||
private:
|
private:
|
||||||
@ -38,7 +38,7 @@ namespace eaudiofx {
|
|||||||
* @brief Get the Block Unique ID
|
* @brief Get the Block Unique ID
|
||||||
* @return the UID
|
* @return the UID
|
||||||
*/
|
*/
|
||||||
size_t getUID(void) {
|
size_t getUID() {
|
||||||
return m_uid;
|
return m_uid;
|
||||||
}
|
}
|
||||||
private:
|
private:
|
||||||
@ -55,7 +55,7 @@ namespace eaudiofx {
|
|||||||
* @brief Set the block name.
|
* @brief Set the block name.
|
||||||
* @return The block name.
|
* @return The block name.
|
||||||
*/
|
*/
|
||||||
virtual const std::string& getName(void) {
|
virtual const std::string& getName() {
|
||||||
return m_name;
|
return m_name;
|
||||||
}
|
}
|
||||||
private:
|
private:
|
||||||
@ -64,7 +64,7 @@ namespace eaudiofx {
|
|||||||
/**
|
/**
|
||||||
* @brief Get block type
|
* @brief Get block type
|
||||||
*/
|
*/
|
||||||
virtual enum blockType getType(void) {
|
virtual enum blockType getType() {
|
||||||
return m_type;
|
return m_type;
|
||||||
};
|
};
|
||||||
protected:
|
protected:
|
||||||
@ -81,7 +81,7 @@ namespace eaudiofx {
|
|||||||
* @brief Get parrent ob this block
|
* @brief Get parrent ob this block
|
||||||
* @return Pointer on the parrent if one is set.
|
* @return Pointer on the parrent if one is set.
|
||||||
*/
|
*/
|
||||||
virtual eaudiofx::BlockMeta* getParrent(void) {
|
virtual eaudiofx::BlockMeta* getParrent() {
|
||||||
return m_parent;
|
return m_parent;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
@ -109,20 +109,20 @@ namespace eaudiofx {
|
|||||||
* @brief Init the block with the properties
|
* @brief Init the block with the properties
|
||||||
* @return A generic error.
|
* @return A generic error.
|
||||||
*/
|
*/
|
||||||
virtual int32_t init(void) {
|
virtual int32_t init() {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* @brief UnInit the block with the properties
|
* @brief UnInit the block with the properties
|
||||||
* @return A generic error.
|
* @return A generic error.
|
||||||
*/
|
*/
|
||||||
virtual int32_t unInit(void) {
|
virtual int32_t unInit() {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
virtual int32_t start(void) {
|
virtual int32_t start() {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
virtual int32_t stop(void) {
|
virtual int32_t stop() {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
@ -163,7 +163,7 @@ namespace eaudiofx {
|
|||||||
* @brief Reset the block
|
* @brief Reset the block
|
||||||
* @return generic error
|
* @return generic error
|
||||||
*/
|
*/
|
||||||
virtual int32_t reset(void) {
|
virtual int32_t reset() {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
public:
|
public:
|
||||||
@ -201,7 +201,7 @@ namespace eaudiofx {
|
|||||||
// TODO : Autogenerate buffer for parameter ...
|
// TODO : Autogenerate buffer for parameter ...
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
IOProperty(void) :
|
IOProperty() :
|
||||||
m_type(ioUnknow),
|
m_type(ioUnknow),
|
||||||
m_internal(false),
|
m_internal(false),
|
||||||
m_buffer(NULL) {
|
m_buffer(NULL) {
|
||||||
@ -237,7 +237,7 @@ namespace eaudiofx {
|
|||||||
* @brief Update the IO property
|
* @brief Update the IO property
|
||||||
* @return A generic error.
|
* @return A generic error.
|
||||||
*/
|
*/
|
||||||
virtual int32_t UpdateIOProperty(void) {
|
virtual int32_t UpdateIOProperty() {
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::BlockDecoder::BlockDecoder(void) :
|
eaudiofx::BlockDecoder::BlockDecoder() :
|
||||||
m_nbSampleIn(0) {
|
m_nbSampleIn(0) {
|
||||||
setType(eaudiofx::blockTypeDecoder);
|
setType(eaudiofx::blockTypeDecoder);
|
||||||
// set input :
|
// set input :
|
||||||
@ -120,13 +120,13 @@ int32_t eaudiofx::BlockDecoder::pull(double _currentTime, int32_t _request, floa
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::BlockDecoder::init(void) {
|
int32_t eaudiofx::BlockDecoder::init() {
|
||||||
|
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::BlockDecoder::unInit(void) {
|
int32_t eaudiofx::BlockDecoder::unInit() {
|
||||||
|
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
}
|
}
|
||||||
|
@ -15,12 +15,12 @@ namespace eaudiofx {
|
|||||||
class BlockDecoder : public eaudiofx::Block {
|
class BlockDecoder : public eaudiofx::Block {
|
||||||
#define MAX_DATA_IN_BUFFER (8*1024)
|
#define MAX_DATA_IN_BUFFER (8*1024)
|
||||||
public:
|
public:
|
||||||
BlockDecoder(void);
|
BlockDecoder();
|
||||||
virtual ~BlockDecoder(void) {};
|
virtual ~BlockDecoder() {};
|
||||||
public: // herited function
|
public: // herited function
|
||||||
int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
int32_t pull(double _currentTime, int32_t _request, float _timeout);
|
||||||
int32_t init(void);
|
int32_t init();
|
||||||
int32_t unInit(void);
|
int32_t unInit();
|
||||||
protected:
|
protected:
|
||||||
float m_tmpBuffer[MAX_DATA_IN_BUFFER]; //!< internal buffer with data ...
|
float m_tmpBuffer[MAX_DATA_IN_BUFFER]; //!< internal buffer with data ...
|
||||||
int32_t m_nbSampleIn; //<! number of sample in the tmpBuffer.
|
int32_t m_nbSampleIn; //<! number of sample in the tmpBuffer.
|
||||||
|
@ -10,6 +10,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::BlockEncoder::BlockEncoder(void) {
|
eaudiofx::BlockEncoder::BlockEncoder() {
|
||||||
setType(eaudiofx::blockTypeEncoder);
|
setType(eaudiofx::blockTypeEncoder);
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class BlockEncoder : public eaudiofx::Block {
|
class BlockEncoder : public eaudiofx::Block {
|
||||||
public:
|
public:
|
||||||
BlockEncoder(void);
|
BlockEncoder();
|
||||||
virtual ~BlockEncoder(void) {};
|
virtual ~BlockEncoder() {};
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -8,6 +8,6 @@
|
|||||||
|
|
||||||
#include <eaudiofx/core/BlockFilter.h>
|
#include <eaudiofx/core/BlockFilter.h>
|
||||||
|
|
||||||
eaudiofx::BlockFilter::BlockFilter(void) {
|
eaudiofx::BlockFilter::BlockFilter() {
|
||||||
setType(eaudiofx::blockTypeFilter);
|
setType(eaudiofx::blockTypeFilter);
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class BlockFilter : public eaudiofx::Block {
|
class BlockFilter : public eaudiofx::Block {
|
||||||
public:
|
public:
|
||||||
BlockFilter(void);
|
BlockFilter();
|
||||||
virtual ~BlockFilter(void) {};
|
virtual ~BlockFilter() {};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <eaudiofx/core/BlockGenerator.h>
|
#include <eaudiofx/core/BlockGenerator.h>
|
||||||
|
|
||||||
eaudiofx::BlockGenerator::BlockGenerator(void) :
|
eaudiofx::BlockGenerator::BlockGenerator() :
|
||||||
m_isLive(false) {
|
m_isLive(false) {
|
||||||
setType(eaudiofx::blockTypeGenerator);
|
setType(eaudiofx::blockTypeGenerator);
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class BlockGenerator : public eaudiofx::Block {
|
class BlockGenerator : public eaudiofx::Block {
|
||||||
public:
|
public:
|
||||||
BlockGenerator(void);
|
BlockGenerator();
|
||||||
virtual ~BlockGenerator(void) {};
|
virtual ~BlockGenerator() {};
|
||||||
private:
|
private:
|
||||||
bool m_isLive; //!< a generator mark as a live element is manage by an external event system like IO interuption
|
bool m_isLive; //!< a generator mark as a live element is manage by an external event system like IO interuption
|
||||||
public:
|
public:
|
||||||
@ -24,7 +24,7 @@ namespace eaudiofx {
|
|||||||
* @return true This is a live stream
|
* @return true This is a live stream
|
||||||
* @return false This is not a live stream
|
* @return false This is not a live stream
|
||||||
*/
|
*/
|
||||||
bool getLive(void) {
|
bool getLive() {
|
||||||
return m_isLive;
|
return m_isLive;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -11,11 +11,11 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
eaudiofx::BlockMeta::BlockMeta(void) {
|
eaudiofx::BlockMeta::BlockMeta() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
eaudiofx::BlockMeta::~BlockMeta(void) {
|
eaudiofx::BlockMeta::~BlockMeta() {
|
||||||
// TODO : Unlink all ...
|
// TODO : Unlink all ...
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if (it == NULL) {
|
if (it == NULL) {
|
||||||
@ -118,7 +118,7 @@ int32_t eaudiofx::BlockMeta::openStream(const std::string& _stream) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::BlockMeta::init(void) {
|
int32_t eaudiofx::BlockMeta::init() {
|
||||||
EAUDIOFX_INFO("[" << getUID() << "]Init Meta block : '" << getName() << "'");
|
EAUDIOFX_INFO("[" << getUID() << "]Init Meta block : '" << getName() << "'");
|
||||||
int32_t ret = eaudiofx::ERR_NONE;
|
int32_t ret = eaudiofx::ERR_NONE;
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
@ -135,7 +135,7 @@ int32_t eaudiofx::BlockMeta::init(void) {
|
|||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
int32_t eaudiofx::BlockMeta::unInit(void) {
|
int32_t eaudiofx::BlockMeta::unInit() {
|
||||||
int32_t ret = eaudiofx::ERR_NONE;
|
int32_t ret = eaudiofx::ERR_NONE;
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
if (it == NULL) {
|
if (it == NULL) {
|
||||||
@ -152,7 +152,7 @@ int32_t eaudiofx::BlockMeta::unInit(void) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::BlockMeta::start(void) {
|
int32_t eaudiofx::BlockMeta::start() {
|
||||||
EAUDIOFX_INFO("[" << getUID() << "] Start Meta block : '" << getName() << "'");
|
EAUDIOFX_INFO("[" << getUID() << "] Start Meta block : '" << getName() << "'");
|
||||||
int32_t ret = eaudiofx::ERR_NONE;
|
int32_t ret = eaudiofx::ERR_NONE;
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
@ -169,7 +169,7 @@ int32_t eaudiofx::BlockMeta::start(void) {
|
|||||||
return ret;
|
return ret;
|
||||||
};
|
};
|
||||||
|
|
||||||
int32_t eaudiofx::BlockMeta::stop(void) {
|
int32_t eaudiofx::BlockMeta::stop() {
|
||||||
EAUDIOFX_INFO("[" << getUID() << "] Stop Meta block : '" << getName() << "'");
|
EAUDIOFX_INFO("[" << getUID() << "] Stop Meta block : '" << getName() << "'");
|
||||||
int32_t ret = eaudiofx::ERR_NONE;
|
int32_t ret = eaudiofx::ERR_NONE;
|
||||||
for (auto &it : m_list) {
|
for (auto &it : m_list) {
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class BlockMeta : public eaudiofx::Block {
|
class BlockMeta : public eaudiofx::Block {
|
||||||
public:
|
public:
|
||||||
BlockMeta(void);
|
BlockMeta();
|
||||||
virtual ~BlockMeta(void);
|
virtual ~BlockMeta();
|
||||||
private:
|
private:
|
||||||
std::vector<eaudiofx::Block*> m_list; //!< list of all block to process.
|
std::vector<eaudiofx::Block*> m_list; //!< list of all block to process.
|
||||||
protected:
|
protected:
|
||||||
@ -80,10 +80,10 @@ namespace eaudiofx {
|
|||||||
*/
|
*/
|
||||||
int32_t openStream(const std::string& _stream);
|
int32_t openStream(const std::string& _stream);
|
||||||
public: // herited function
|
public: // herited function
|
||||||
virtual int32_t init(void);
|
virtual int32_t init();
|
||||||
virtual int32_t unInit(void);
|
virtual int32_t unInit();
|
||||||
virtual int32_t start(void);
|
virtual int32_t start();
|
||||||
virtual int32_t stop(void);
|
virtual int32_t stop();
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <eaudiofx/core/BlockReceiver.h>
|
#include <eaudiofx/core/BlockReceiver.h>
|
||||||
|
|
||||||
eaudiofx::BlockReceiver::BlockReceiver(void) :
|
eaudiofx::BlockReceiver::BlockReceiver() :
|
||||||
m_isLive(false) {
|
m_isLive(false) {
|
||||||
setType(eaudiofx::blockTypeReceiver);
|
setType(eaudiofx::blockTypeReceiver);
|
||||||
}
|
}
|
||||||
|
@ -14,8 +14,8 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class BlockReceiver : public eaudiofx::Block {
|
class BlockReceiver : public eaudiofx::Block {
|
||||||
public:
|
public:
|
||||||
BlockReceiver(void);
|
BlockReceiver();
|
||||||
virtual ~BlockReceiver(void) {};
|
virtual ~BlockReceiver() {};
|
||||||
private:
|
private:
|
||||||
bool m_isLive; //!< a generator mark as a live element is manage by an external event system like IO interuption
|
bool m_isLive; //!< a generator mark as a live element is manage by an external event system like IO interuption
|
||||||
public:
|
public:
|
||||||
@ -24,7 +24,7 @@ namespace eaudiofx {
|
|||||||
* @return true This is a live stream
|
* @return true This is a live stream
|
||||||
* @return false This is not a live stream
|
* @return false This is not a live stream
|
||||||
*/
|
*/
|
||||||
bool getLive(void) {
|
bool getLive() {
|
||||||
return m_isLive;
|
return m_isLive;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -17,7 +17,7 @@ namespace eaudiofx {
|
|||||||
class Buffer {
|
class Buffer {
|
||||||
public:
|
public:
|
||||||
Buffer(eaudiofx::Block& _parent);
|
Buffer(eaudiofx::Block& _parent);
|
||||||
virtual ~Buffer(void) {};
|
virtual ~Buffer() {};
|
||||||
protected:
|
protected:
|
||||||
eaudiofx::Block& m_parent; //!< parrent Block of this Buffer
|
eaudiofx::Block& m_parent; //!< parrent Block of this Buffer
|
||||||
protected:
|
protected:
|
||||||
@ -33,13 +33,13 @@ namespace eaudiofx {
|
|||||||
* @return true if buffer is negosiated.
|
* @return true if buffer is negosiated.
|
||||||
* @return false Not negociated.
|
* @return false Not negociated.
|
||||||
*/
|
*/
|
||||||
bool isNegociated(void) {
|
bool isNegociated() {
|
||||||
return m_negociated;
|
return m_negociated;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* @brief uset the negociation status of the buffer.
|
* @brief uset the negociation status of the buffer.
|
||||||
*/
|
*/
|
||||||
void requestNewNegociation(void) {
|
void requestNewNegociation() {
|
||||||
m_negociated = false;
|
m_negociated = false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -27,7 +27,7 @@ eaudiofx::BufferAudio::BufferAudio(eaudiofx::Block& _parent, int32_t _frequency,
|
|||||||
memset(m_channelType, 0, sizeof(m_channelType));
|
memset(m_channelType, 0, sizeof(m_channelType));
|
||||||
}
|
}
|
||||||
|
|
||||||
eaudiofx::BufferAudio::~BufferAudio(void) {
|
eaudiofx::BufferAudio::~BufferAudio() {
|
||||||
if (m_data != NULL) {
|
if (m_data != NULL) {
|
||||||
delete[] m_data;
|
delete[] m_data;
|
||||||
m_data = NULL;
|
m_data = NULL;
|
||||||
|
@ -16,7 +16,7 @@ namespace eaudiofx {
|
|||||||
public:
|
public:
|
||||||
BufferAudio(eaudiofx::Block& _parent);
|
BufferAudio(eaudiofx::Block& _parent);
|
||||||
BufferAudio(eaudiofx::Block& _parent, int32_t _frequency, int32_t _nbChannel);
|
BufferAudio(eaudiofx::Block& _parent, int32_t _frequency, int32_t _nbChannel);
|
||||||
virtual ~BufferAudio(void);
|
virtual ~BufferAudio();
|
||||||
protected:
|
protected:
|
||||||
int32_t m_frequency;
|
int32_t m_frequency;
|
||||||
int32_t m_nbChannel;
|
int32_t m_nbChannel;
|
||||||
@ -34,7 +34,7 @@ namespace eaudiofx {
|
|||||||
* @brief Get the buffer casted in float*
|
* @brief Get the buffer casted in float*
|
||||||
* @return Pointer on the buffer with correct cast.
|
* @return Pointer on the buffer with correct cast.
|
||||||
*/
|
*/
|
||||||
float* getData(void) {
|
float* getData() {
|
||||||
return m_data;
|
return m_data;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -15,7 +15,7 @@ namespace eaudiofx {
|
|||||||
class BufferAudioFreq : public eaudiofx::BufferAudio {
|
class BufferAudioFreq : public eaudiofx::BufferAudio {
|
||||||
public:
|
public:
|
||||||
BufferAudioFreq(eaudiofx::Block& _parent);
|
BufferAudioFreq(eaudiofx::Block& _parent);
|
||||||
virtual ~BufferAudioFreq(void) {};
|
virtual ~BufferAudioFreq() {};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ namespace eaudiofx {
|
|||||||
public:
|
public:
|
||||||
BufferAudioRaw(eaudiofx::Block& _parent);
|
BufferAudioRaw(eaudiofx::Block& _parent);
|
||||||
BufferAudioRaw(eaudiofx::Block& _parent, int32_t _frequency, int32_t _nbChannel, int32_t _nbSample = -1);
|
BufferAudioRaw(eaudiofx::Block& _parent, int32_t _frequency, int32_t _nbChannel, int32_t _nbSample = -1);
|
||||||
virtual ~BufferAudioRaw(void) {};
|
virtual ~BufferAudioRaw() {};
|
||||||
protected:
|
protected:
|
||||||
size_t m_allocatedSample; //!< generate with m_allocatedBytes/sizeof(**m_audioFormat**) / m_nbChannel;
|
size_t m_allocatedSample; //!< generate with m_allocatedBytes/sizeof(**m_audioFormat**) / m_nbChannel;
|
||||||
protected:
|
protected:
|
||||||
|
@ -22,7 +22,7 @@ namespace eaudiofx {
|
|||||||
class BufferMessage : public eaudiofx::Buffer {
|
class BufferMessage : public eaudiofx::Buffer {
|
||||||
public:
|
public:
|
||||||
BufferMessage(eaudiofx::Block& _parent, int32_t _message = eaudiofx::bufferMessageEndOfStream);
|
BufferMessage(eaudiofx::Block& _parent, int32_t _message = eaudiofx::bufferMessageEndOfStream);
|
||||||
virtual ~BufferMessage(void) {};
|
virtual ~BufferMessage() {};
|
||||||
protected:
|
protected:
|
||||||
int32_t m_messageId; //!< message ID
|
int32_t m_messageId; //!< message ID
|
||||||
public:
|
public:
|
||||||
@ -30,7 +30,7 @@ namespace eaudiofx {
|
|||||||
* @brief Get the message.
|
* @brief Get the message.
|
||||||
* @return The ID of the message (if value is < 0 : custom message ...)
|
* @return The ID of the message (if value is < 0 : custom message ...)
|
||||||
*/
|
*/
|
||||||
int32_t getMessage(void) {
|
int32_t getMessage() {
|
||||||
return m_messageId;
|
return m_messageId;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@ -47,7 +47,7 @@ namespace eaudiofx {
|
|||||||
* @brief get the query complete message
|
* @brief get the query complete message
|
||||||
* @return The requested data
|
* @return The requested data
|
||||||
*/
|
*/
|
||||||
const std::string& getQuery(void) {
|
const std::string& getQuery() {
|
||||||
return m_query;
|
return m_query;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
@ -68,7 +68,7 @@ namespace eaudiofx {
|
|||||||
* @brief get the answer of the query
|
* @brief get the answer of the query
|
||||||
* @return The requested data
|
* @return The requested data
|
||||||
*/
|
*/
|
||||||
const std::string& getAnswer(void) {
|
const std::string& getAnswer() {
|
||||||
return m_answer;
|
return m_answer;
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -16,7 +16,7 @@ eaudiofx::BufferStream::BufferStream(eaudiofx::Block& _parent) :
|
|||||||
m_size(0) {
|
m_size(0) {
|
||||||
|
|
||||||
}
|
}
|
||||||
eaudiofx::BufferStream::~BufferStream(void) {
|
eaudiofx::BufferStream::~BufferStream() {
|
||||||
if (m_data != NULL) {
|
if (m_data != NULL) {
|
||||||
delete[] m_data;
|
delete[] m_data;
|
||||||
m_data = NULL;
|
m_data = NULL;
|
||||||
|
@ -15,7 +15,7 @@ namespace eaudiofx {
|
|||||||
class BufferStream : public eaudiofx::Buffer {
|
class BufferStream : public eaudiofx::Buffer {
|
||||||
public:
|
public:
|
||||||
BufferStream(eaudiofx::Block& _parent);
|
BufferStream(eaudiofx::Block& _parent);
|
||||||
virtual ~BufferStream(void);
|
virtual ~BufferStream();
|
||||||
protected:
|
protected:
|
||||||
uint8_t* m_data; //!< buffer data
|
uint8_t* m_data; //!< buffer data
|
||||||
size_t m_allocated; //!< number of byte allocated
|
size_t m_allocated; //!< number of byte allocated
|
||||||
@ -25,7 +25,7 @@ namespace eaudiofx {
|
|||||||
void setAvaillableSize(size_t _availlableSize) {
|
void setAvaillableSize(size_t _availlableSize) {
|
||||||
m_size = _availlableSize;
|
m_size = _availlableSize;
|
||||||
}
|
}
|
||||||
size_t setAvaillableSize(void) {
|
size_t setAvaillableSize() {
|
||||||
return m_size;
|
return m_size;
|
||||||
}
|
}
|
||||||
public:
|
public:
|
||||||
@ -40,7 +40,7 @@ namespace eaudiofx {
|
|||||||
* @brief Get the buffer casted in float*
|
* @brief Get the buffer casted in float*
|
||||||
* @return Pointer on the buffer with correct cast.
|
* @return Pointer on the buffer with correct cast.
|
||||||
*/
|
*/
|
||||||
uint8_t* getData(void) {
|
uint8_t* getData() {
|
||||||
return m_data;
|
return m_data;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -10,12 +10,12 @@
|
|||||||
#include <eaudiofx/core/Processing.h>
|
#include <eaudiofx/core/Processing.h>
|
||||||
|
|
||||||
|
|
||||||
int32_t eaudiofx::Processing::process(void) {
|
int32_t eaudiofx::Processing::process() {
|
||||||
EAUDIOFX_INFO("Start process : '" << getName() << "'");
|
EAUDIOFX_INFO("Start process : '" << getName() << "'");
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t eaudiofx::Processing::start(void) {
|
int32_t eaudiofx::Processing::start() {
|
||||||
EAUDIOFX_INFO("Start Processing : '" << getName() << "'");
|
EAUDIOFX_INFO("Start Processing : '" << getName() << "'");
|
||||||
int32_t ret = init();
|
int32_t ret = init();
|
||||||
if (ret != eaudiofx::ERR_NONE) {
|
if (ret != eaudiofx::ERR_NONE) {
|
||||||
@ -24,7 +24,7 @@ int32_t eaudiofx::Processing::start(void) {
|
|||||||
return eaudiofx::BlockMeta::start();
|
return eaudiofx::BlockMeta::start();
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t eaudiofx::Processing::stop(void) {
|
int32_t eaudiofx::Processing::stop() {
|
||||||
EAUDIOFX_INFO("Stop Processing : '" << getName() << "'");
|
EAUDIOFX_INFO("Stop Processing : '" << getName() << "'");
|
||||||
int32_t ret = eaudiofx::BlockMeta::stop();
|
int32_t ret = eaudiofx::BlockMeta::stop();
|
||||||
if (ret != eaudiofx::ERR_NONE) {
|
if (ret != eaudiofx::ERR_NONE) {
|
||||||
@ -33,7 +33,7 @@ int32_t eaudiofx::Processing::stop(void) {
|
|||||||
return unInit();
|
return unInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t eaudiofx::Processing::waitEndOfProcess(void) {
|
int32_t eaudiofx::Processing::waitEndOfProcess() {
|
||||||
EAUDIOFX_INFO("wait end of Processing : '" << getName() << "'");
|
EAUDIOFX_INFO("wait end of Processing : '" << getName() << "'");
|
||||||
return eaudiofx::ERR_NONE;
|
return eaudiofx::ERR_NONE;
|
||||||
}
|
}
|
@ -18,14 +18,14 @@
|
|||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
class Processing : public eaudiofx::BlockMeta {
|
class Processing : public eaudiofx::BlockMeta {
|
||||||
public:
|
public:
|
||||||
Processing(void) {};
|
Processing() {};
|
||||||
virtual ~Processing(void) {};
|
virtual ~Processing() {};
|
||||||
public:
|
public:
|
||||||
int32_t process(void);
|
int32_t process();
|
||||||
int32_t start(void);
|
int32_t start();
|
||||||
int32_t stop(void);
|
int32_t stop();
|
||||||
int32_t waitEndOfProcess(void);
|
int32_t waitEndOfProcess();
|
||||||
bool isLiveStream(void) {
|
bool isLiveStream() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
#include <eaudiofx/debug.h>
|
#include <eaudiofx/debug.h>
|
||||||
|
|
||||||
int32_t eaudiofx::getLogId(void) {
|
int32_t eaudiofx::getLogId() {
|
||||||
static int32_t g_val = etk::log::registerInstance("eaudiofx");
|
static int32_t g_val = etk::log::registerInstance("eaudiofx");
|
||||||
return g_val;
|
return g_val;
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <etk/log.h>
|
#include <etk/log.h>
|
||||||
|
|
||||||
namespace eaudiofx {
|
namespace eaudiofx {
|
||||||
int32_t getLogId(void);
|
int32_t getLogId();
|
||||||
};
|
};
|
||||||
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
||||||
#define EAUDIOFX_BASE(info,data) \
|
#define EAUDIOFX_BASE(info,data) \
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
static const char* const g_eventPlay1 = "appl-play-1";
|
static const char* const g_eventPlay1 = "appl-play-1";
|
||||||
static const char* const g_eventPlay2 = "appl-play-2";
|
static const char* const g_eventPlay2 = "appl-play-2";
|
||||||
|
|
||||||
appl::Windows::Windows(void) :
|
appl::Windows::Windows() :
|
||||||
m_composer(NULL) {
|
m_composer(NULL) {
|
||||||
setTitle("example 001_HelloWord");
|
setTitle("example 001_HelloWord");
|
||||||
std::string composition = std::string("");
|
std::string composition = std::string("");
|
||||||
|
@ -17,7 +17,7 @@ namespace appl {
|
|||||||
private:
|
private:
|
||||||
ewol::widget::Composer* m_composer;
|
ewol::widget::Composer* m_composer;
|
||||||
public:
|
public:
|
||||||
Windows(void);
|
Windows();
|
||||||
public: // herited functions
|
public: // herited functions
|
||||||
virtual void onObjectRemove(ewol::Object * _removeObject);
|
virtual void onObjectRemove(ewol::Object * _removeObject);
|
||||||
virtual void onReceiveMessage(const ewol::object::Message& _msg);
|
virtual void onReceiveMessage(const ewol::object::Message& _msg);
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#include <test/debug.h>
|
#include <test/debug.h>
|
||||||
|
|
||||||
int32_t appl::getLogId(void) {
|
int32_t appl::getLogId() {
|
||||||
static int32_t g_val = etk::log::registerInstance("ea-fx TT");
|
static int32_t g_val = etk::log::registerInstance("ea-fx TT");
|
||||||
return g_val;
|
return g_val;
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
#include <etk/log.h>
|
#include <etk/log.h>
|
||||||
|
|
||||||
namespace appl {
|
namespace appl {
|
||||||
int32_t getLogId(void);
|
int32_t getLogId();
|
||||||
};
|
};
|
||||||
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
|
||||||
#define APPL_BASE(info,data) \
|
#define APPL_BASE(info,data) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user