[STYLE] remove (void) in () to be c++ coherent

This commit is contained in:
Edouard DUPIN 2014-05-15 21:37:39 +02:00
parent 28982a1bbd
commit 18c2370065
39 changed files with 107 additions and 107 deletions

View File

@ -13,7 +13,7 @@
eaudiofx::GeneratorFile::GeneratorFile(void) :
eaudiofx::GeneratorFile::GeneratorFile() :
m_file(NULL) {
// set output :
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");
if (m_file == NULL) {
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) {
return eaudiofx::ERR_NONE;
}

View File

@ -15,14 +15,14 @@
namespace eaudiofx {
class GeneratorFile : public eaudiofx::BlockGenerator {
public:
GeneratorFile(void);
virtual ~GeneratorFile(void) {};
GeneratorFile();
virtual ~GeneratorFile() {};
protected:
etk::FSNode* m_file;
public: // herieted function :
virtual int32_t pull(double _currentTime, int32_t _request, float _timeout);
virtual int32_t init(void);
virtual int32_t unInit(void);
virtual int32_t init();
virtual int32_t unInit();
};
};

View File

@ -10,7 +10,7 @@
#include <eaudiofx/core/BufferAudioRaw.h>
#include <airtaudio/Interface.h>
eaudiofx::GeneratorRtAudio::GeneratorRtAudio(void) {
eaudiofx::GeneratorRtAudio::GeneratorRtAudio() {
setLive(true);
// set output :
m_io.insert(

View File

@ -14,8 +14,8 @@
namespace eaudiofx {
class GeneratorRtAudio : public eaudiofx::BlockGenerator {
public:
GeneratorRtAudio(void);
virtual ~GeneratorRtAudio(void) {};
GeneratorRtAudio();
virtual ~GeneratorRtAudio() {};
public:
int32_t pull(double _currentTime, int32_t _request, float _timeout);
};

View File

@ -12,7 +12,7 @@
#include <math.h>
eaudiofx::GeneratorSignal::GeneratorSignal(void) :
eaudiofx::GeneratorSignal::GeneratorSignal() :
m_phase(0) {
// set output :
m_io.insert(

View File

@ -16,8 +16,8 @@ namespace eaudiofx {
protected:
float m_phase;
public:
GeneratorSignal(void);
virtual ~GeneratorSignal(void) {};
GeneratorSignal();
virtual ~GeneratorSignal() {};
public:
int32_t pull(double _currentTime, int32_t _request, float _timeout);
};

View File

@ -14,8 +14,8 @@
namespace eaudiofx {
class ReceiverFile : public eaudiofx::BlockReceiver {
public:
ReceiverFile(void) {};
virtual ~ReceiverFile(void) {};
ReceiverFile() {};
virtual ~ReceiverFile() {};
};
};

View File

@ -76,7 +76,7 @@ int32_t eaudiofx::ReceiverRtAudio::needData(float* _outputBuffer,
eaudiofx::ReceiverRtAudio::ReceiverRtAudio(void) :
eaudiofx::ReceiverRtAudio::ReceiverRtAudio() :
m_processStarted(false) {
setLive(true);
// 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 ...");
m_dac.instanciate();
EAUDIOFX_DEBUG("Create RTAudio receiver ...");
@ -114,7 +114,7 @@ int32_t eaudiofx::ReceiverRtAudio::init(void) {
return eaudiofx::ERR_NONE;
};
int32_t eaudiofx::ReceiverRtAudio::unInit(void) {
int32_t eaudiofx::ReceiverRtAudio::unInit() {
EAUDIOFX_DEBUG("un-init Stream ...");
// Stop the stream
m_dac.stopStream();
@ -126,13 +126,13 @@ int32_t eaudiofx::ReceiverRtAudio::unInit(void) {
return eaudiofx::ERR_NONE;
};
int32_t eaudiofx::ReceiverRtAudio::start(void) {
int32_t eaudiofx::ReceiverRtAudio::start() {
EAUDIOFX_DEBUG("Start stream ...");
m_processStarted = true;
return eaudiofx::ERR_NONE;
};
int32_t eaudiofx::ReceiverRtAudio::stop(void) {
int32_t eaudiofx::ReceiverRtAudio::stop() {
EAUDIOFX_DEBUG("Stop Stream ...");
m_processStarted = false;
return eaudiofx::ERR_NONE;

View File

@ -27,16 +27,16 @@ namespace eaudiofx {
double _streamTime,
airtaudio::streamStatus _status);
public:
ReceiverRtAudio(void);
virtual ~ReceiverRtAudio(void) {};
ReceiverRtAudio();
virtual ~ReceiverRtAudio() {};
public: // herieted function :
virtual int32_t init(void);
virtual int32_t unInit(void);
virtual int32_t init();
virtual int32_t unInit();
private:
bool m_processStarted;
public:
virtual int32_t start(void);
virtual int32_t stop(void);
virtual int32_t start();
virtual int32_t stop();
protected:
airtaudio::Interface m_dac;
airtaudio::StreamParameters m_parameters;

View File

@ -13,7 +13,7 @@
eaudiofx::Block::Block(void) :
eaudiofx::Block::Block() :
m_uid(0),
m_type(),
m_parent(NULL) {
@ -22,7 +22,7 @@ eaudiofx::Block::Block(void) :
id++;
}
eaudiofx::Block::~Block(void) {
eaudiofx::Block::~Block() {
for (auto &it : m_io) {
if (it.second.m_buffer == NULL) {
continue;

View File

@ -27,8 +27,8 @@ namespace eaudiofx {
};
class Block {
public:
Block(void);
virtual ~Block(void);
Block();
virtual ~Block();
protected:
std::mutex m_mutex; //!< Block mutex access
private:
@ -38,7 +38,7 @@ namespace eaudiofx {
* @brief Get the Block Unique ID
* @return the UID
*/
size_t getUID(void) {
size_t getUID() {
return m_uid;
}
private:
@ -55,7 +55,7 @@ namespace eaudiofx {
* @brief Set the block name.
* @return The block name.
*/
virtual const std::string& getName(void) {
virtual const std::string& getName() {
return m_name;
}
private:
@ -64,7 +64,7 @@ namespace eaudiofx {
/**
* @brief Get block type
*/
virtual enum blockType getType(void) {
virtual enum blockType getType() {
return m_type;
};
protected:
@ -81,7 +81,7 @@ namespace eaudiofx {
* @brief Get parrent ob this block
* @return Pointer on the parrent if one is set.
*/
virtual eaudiofx::BlockMeta* getParrent(void) {
virtual eaudiofx::BlockMeta* getParrent() {
return m_parent;
};
/**
@ -109,20 +109,20 @@ namespace eaudiofx {
* @brief Init the block with the properties
* @return A generic error.
*/
virtual int32_t init(void) {
virtual int32_t init() {
return eaudiofx::ERR_NONE;
};
/**
* @brief UnInit the block with the properties
* @return A generic error.
*/
virtual int32_t unInit(void) {
virtual int32_t unInit() {
return eaudiofx::ERR_NONE;
};
virtual int32_t start(void) {
virtual int32_t start() {
return eaudiofx::ERR_NONE;
};
virtual int32_t stop(void) {
virtual int32_t stop() {
return eaudiofx::ERR_NONE;
};
/**
@ -163,7 +163,7 @@ namespace eaudiofx {
* @brief Reset the block
* @return generic error
*/
virtual int32_t reset(void) {
virtual int32_t reset() {
return eaudiofx::ERR_NONE;
};
public:
@ -201,7 +201,7 @@ namespace eaudiofx {
// TODO : Autogenerate buffer for parameter ...
}
}
IOProperty(void) :
IOProperty() :
m_type(ioUnknow),
m_internal(false),
m_buffer(NULL) {
@ -237,7 +237,7 @@ namespace eaudiofx {
* @brief Update the IO property
* @return A generic error.
*/
virtual int32_t UpdateIOProperty(void) {
virtual int32_t UpdateIOProperty() {
return eaudiofx::ERR_NONE;
};
};

View File

@ -14,7 +14,7 @@
eaudiofx::BlockDecoder::BlockDecoder(void) :
eaudiofx::BlockDecoder::BlockDecoder() :
m_nbSampleIn(0) {
setType(eaudiofx::blockTypeDecoder);
// 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;
}
int32_t eaudiofx::BlockDecoder::unInit(void) {
int32_t eaudiofx::BlockDecoder::unInit() {
return eaudiofx::ERR_NONE;
}

View File

@ -15,12 +15,12 @@ namespace eaudiofx {
class BlockDecoder : public eaudiofx::Block {
#define MAX_DATA_IN_BUFFER (8*1024)
public:
BlockDecoder(void);
virtual ~BlockDecoder(void) {};
BlockDecoder();
virtual ~BlockDecoder() {};
public: // herited function
int32_t pull(double _currentTime, int32_t _request, float _timeout);
int32_t init(void);
int32_t unInit(void);
int32_t init();
int32_t unInit();
protected:
float m_tmpBuffer[MAX_DATA_IN_BUFFER]; //!< internal buffer with data ...
int32_t m_nbSampleIn; //<! number of sample in the tmpBuffer.

View File

@ -10,6 +10,6 @@
eaudiofx::BlockEncoder::BlockEncoder(void) {
eaudiofx::BlockEncoder::BlockEncoder() {
setType(eaudiofx::blockTypeEncoder);
}

View File

@ -14,8 +14,8 @@
namespace eaudiofx {
class BlockEncoder : public eaudiofx::Block {
public:
BlockEncoder(void);
virtual ~BlockEncoder(void) {};
BlockEncoder();
virtual ~BlockEncoder() {};
};
};

View File

@ -8,6 +8,6 @@
#include <eaudiofx/core/BlockFilter.h>
eaudiofx::BlockFilter::BlockFilter(void) {
eaudiofx::BlockFilter::BlockFilter() {
setType(eaudiofx::blockTypeFilter);
}

View File

@ -14,8 +14,8 @@
namespace eaudiofx {
class BlockFilter : public eaudiofx::Block {
public:
BlockFilter(void);
virtual ~BlockFilter(void) {};
BlockFilter();
virtual ~BlockFilter() {};
};
};

View File

@ -8,7 +8,7 @@
#include <eaudiofx/core/BlockGenerator.h>
eaudiofx::BlockGenerator::BlockGenerator(void) :
eaudiofx::BlockGenerator::BlockGenerator() :
m_isLive(false) {
setType(eaudiofx::blockTypeGenerator);
}

View File

@ -14,8 +14,8 @@
namespace eaudiofx {
class BlockGenerator : public eaudiofx::Block {
public:
BlockGenerator(void);
virtual ~BlockGenerator(void) {};
BlockGenerator();
virtual ~BlockGenerator() {};
private:
bool m_isLive; //!< a generator mark as a live element is manage by an external event system like IO interuption
public:
@ -24,7 +24,7 @@ namespace eaudiofx {
* @return true This is a live stream
* @return false This is not a live stream
*/
bool getLive(void) {
bool getLive() {
return m_isLive;
}
/**

View File

@ -11,11 +11,11 @@
eaudiofx::BlockMeta::BlockMeta(void) {
eaudiofx::BlockMeta::BlockMeta() {
}
eaudiofx::BlockMeta::~BlockMeta(void) {
eaudiofx::BlockMeta::~BlockMeta() {
// TODO : Unlink all ...
for (auto &it : m_list) {
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() << "'");
int32_t ret = eaudiofx::ERR_NONE;
for (auto &it : m_list) {
@ -135,7 +135,7 @@ int32_t eaudiofx::BlockMeta::init(void) {
return ret;
};
int32_t eaudiofx::BlockMeta::unInit(void) {
int32_t eaudiofx::BlockMeta::unInit() {
int32_t ret = eaudiofx::ERR_NONE;
for (auto &it : m_list) {
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() << "'");
int32_t ret = eaudiofx::ERR_NONE;
for (auto &it : m_list) {
@ -169,7 +169,7 @@ int32_t eaudiofx::BlockMeta::start(void) {
return ret;
};
int32_t eaudiofx::BlockMeta::stop(void) {
int32_t eaudiofx::BlockMeta::stop() {
EAUDIOFX_INFO("[" << getUID() << "] Stop Meta block : '" << getName() << "'");
int32_t ret = eaudiofx::ERR_NONE;
for (auto &it : m_list) {

View File

@ -15,8 +15,8 @@
namespace eaudiofx {
class BlockMeta : public eaudiofx::Block {
public:
BlockMeta(void);
virtual ~BlockMeta(void);
BlockMeta();
virtual ~BlockMeta();
private:
std::vector<eaudiofx::Block*> m_list; //!< list of all block to process.
protected:
@ -80,10 +80,10 @@ namespace eaudiofx {
*/
int32_t openStream(const std::string& _stream);
public: // herited function
virtual int32_t init(void);
virtual int32_t unInit(void);
virtual int32_t start(void);
virtual int32_t stop(void);
virtual int32_t init();
virtual int32_t unInit();
virtual int32_t start();
virtual int32_t stop();
};
};

View File

@ -8,7 +8,7 @@
#include <eaudiofx/core/BlockReceiver.h>
eaudiofx::BlockReceiver::BlockReceiver(void) :
eaudiofx::BlockReceiver::BlockReceiver() :
m_isLive(false) {
setType(eaudiofx::blockTypeReceiver);
}

View File

@ -14,8 +14,8 @@
namespace eaudiofx {
class BlockReceiver : public eaudiofx::Block {
public:
BlockReceiver(void);
virtual ~BlockReceiver(void) {};
BlockReceiver();
virtual ~BlockReceiver() {};
private:
bool m_isLive; //!< a generator mark as a live element is manage by an external event system like IO interuption
public:
@ -24,7 +24,7 @@ namespace eaudiofx {
* @return true This is a live stream
* @return false This is not a live stream
*/
bool getLive(void) {
bool getLive() {
return m_isLive;
}
/**

View File

@ -17,7 +17,7 @@ namespace eaudiofx {
class Buffer {
public:
Buffer(eaudiofx::Block& _parent);
virtual ~Buffer(void) {};
virtual ~Buffer() {};
protected:
eaudiofx::Block& m_parent; //!< parrent Block of this Buffer
protected:
@ -33,13 +33,13 @@ namespace eaudiofx {
* @return true if buffer is negosiated.
* @return false Not negociated.
*/
bool isNegociated(void) {
bool isNegociated() {
return m_negociated;
}
/**
* @brief uset the negociation status of the buffer.
*/
void requestNewNegociation(void) {
void requestNewNegociation() {
m_negociated = false;
}
};

View File

@ -27,7 +27,7 @@ eaudiofx::BufferAudio::BufferAudio(eaudiofx::Block& _parent, int32_t _frequency,
memset(m_channelType, 0, sizeof(m_channelType));
}
eaudiofx::BufferAudio::~BufferAudio(void) {
eaudiofx::BufferAudio::~BufferAudio() {
if (m_data != NULL) {
delete[] m_data;
m_data = NULL;

View File

@ -16,7 +16,7 @@ namespace eaudiofx {
public:
BufferAudio(eaudiofx::Block& _parent);
BufferAudio(eaudiofx::Block& _parent, int32_t _frequency, int32_t _nbChannel);
virtual ~BufferAudio(void);
virtual ~BufferAudio();
protected:
int32_t m_frequency;
int32_t m_nbChannel;
@ -34,7 +34,7 @@ namespace eaudiofx {
* @brief Get the buffer casted in float*
* @return Pointer on the buffer with correct cast.
*/
float* getData(void) {
float* getData() {
return m_data;
}
};

View File

@ -15,7 +15,7 @@ namespace eaudiofx {
class BufferAudioFreq : public eaudiofx::BufferAudio {
public:
BufferAudioFreq(eaudiofx::Block& _parent);
virtual ~BufferAudioFreq(void) {};
virtual ~BufferAudioFreq() {};
};
};

View File

@ -16,7 +16,7 @@ namespace eaudiofx {
public:
BufferAudioRaw(eaudiofx::Block& _parent);
BufferAudioRaw(eaudiofx::Block& _parent, int32_t _frequency, int32_t _nbChannel, int32_t _nbSample = -1);
virtual ~BufferAudioRaw(void) {};
virtual ~BufferAudioRaw() {};
protected:
size_t m_allocatedSample; //!< generate with m_allocatedBytes/sizeof(**m_audioFormat**) / m_nbChannel;
protected:

View File

@ -22,7 +22,7 @@ namespace eaudiofx {
class BufferMessage : public eaudiofx::Buffer {
public:
BufferMessage(eaudiofx::Block& _parent, int32_t _message = eaudiofx::bufferMessageEndOfStream);
virtual ~BufferMessage(void) {};
virtual ~BufferMessage() {};
protected:
int32_t m_messageId; //!< message ID
public:
@ -30,7 +30,7 @@ namespace eaudiofx {
* @brief Get the message.
* @return The ID of the message (if value is < 0 : custom message ...)
*/
int32_t getMessage(void) {
int32_t getMessage() {
return m_messageId;
}
/**
@ -47,7 +47,7 @@ namespace eaudiofx {
* @brief get the query complete message
* @return The requested data
*/
const std::string& getQuery(void) {
const std::string& getQuery() {
return m_query;
}
/**
@ -68,7 +68,7 @@ namespace eaudiofx {
* @brief get the answer of the query
* @return The requested data
*/
const std::string& getAnswer(void) {
const std::string& getAnswer() {
return m_answer;
}
/**

View File

@ -16,7 +16,7 @@ eaudiofx::BufferStream::BufferStream(eaudiofx::Block& _parent) :
m_size(0) {
}
eaudiofx::BufferStream::~BufferStream(void) {
eaudiofx::BufferStream::~BufferStream() {
if (m_data != NULL) {
delete[] m_data;
m_data = NULL;

View File

@ -15,7 +15,7 @@ namespace eaudiofx {
class BufferStream : public eaudiofx::Buffer {
public:
BufferStream(eaudiofx::Block& _parent);
virtual ~BufferStream(void);
virtual ~BufferStream();
protected:
uint8_t* m_data; //!< buffer data
size_t m_allocated; //!< number of byte allocated
@ -25,7 +25,7 @@ namespace eaudiofx {
void setAvaillableSize(size_t _availlableSize) {
m_size = _availlableSize;
}
size_t setAvaillableSize(void) {
size_t setAvaillableSize() {
return m_size;
}
public:
@ -40,7 +40,7 @@ namespace eaudiofx {
* @brief Get the buffer casted in float*
* @return Pointer on the buffer with correct cast.
*/
uint8_t* getData(void) {
uint8_t* getData() {
return m_data;
}
};

View File

@ -10,12 +10,12 @@
#include <eaudiofx/core/Processing.h>
int32_t eaudiofx::Processing::process(void) {
int32_t eaudiofx::Processing::process() {
EAUDIOFX_INFO("Start process : '" << getName() << "'");
return eaudiofx::ERR_NONE;
}
int32_t eaudiofx::Processing::start(void) {
int32_t eaudiofx::Processing::start() {
EAUDIOFX_INFO("Start Processing : '" << getName() << "'");
int32_t ret = init();
if (ret != eaudiofx::ERR_NONE) {
@ -24,7 +24,7 @@ int32_t eaudiofx::Processing::start(void) {
return eaudiofx::BlockMeta::start();
}
int32_t eaudiofx::Processing::stop(void) {
int32_t eaudiofx::Processing::stop() {
EAUDIOFX_INFO("Stop Processing : '" << getName() << "'");
int32_t ret = eaudiofx::BlockMeta::stop();
if (ret != eaudiofx::ERR_NONE) {
@ -33,7 +33,7 @@ int32_t eaudiofx::Processing::stop(void) {
return unInit();
}
int32_t eaudiofx::Processing::waitEndOfProcess(void) {
int32_t eaudiofx::Processing::waitEndOfProcess() {
EAUDIOFX_INFO("wait end of Processing : '" << getName() << "'");
return eaudiofx::ERR_NONE;
}

View File

@ -18,14 +18,14 @@
namespace eaudiofx {
class Processing : public eaudiofx::BlockMeta {
public:
Processing(void) {};
virtual ~Processing(void) {};
Processing() {};
virtual ~Processing() {};
public:
int32_t process(void);
int32_t start(void);
int32_t stop(void);
int32_t waitEndOfProcess(void);
bool isLiveStream(void) {
int32_t process();
int32_t start();
int32_t stop();
int32_t waitEndOfProcess();
bool isLiveStream() {
return false;
}

View File

@ -8,7 +8,7 @@
#include <eaudiofx/debug.h>
int32_t eaudiofx::getLogId(void) {
int32_t eaudiofx::getLogId() {
static int32_t g_val = etk::log::registerInstance("eaudiofx");
return g_val;
}

View File

@ -12,7 +12,7 @@
#include <etk/log.h>
namespace eaudiofx {
int32_t getLogId(void);
int32_t getLogId();
};
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define EAUDIOFX_BASE(info,data) \

View File

@ -24,7 +24,7 @@
static const char* const g_eventPlay1 = "appl-play-1";
static const char* const g_eventPlay2 = "appl-play-2";
appl::Windows::Windows(void) :
appl::Windows::Windows() :
m_composer(NULL) {
setTitle("example 001_HelloWord");
std::string composition = std::string("");

View File

@ -17,7 +17,7 @@ namespace appl {
private:
ewol::widget::Composer* m_composer;
public:
Windows(void);
Windows();
public: // herited functions
virtual void onObjectRemove(ewol::Object * _removeObject);
virtual void onReceiveMessage(const ewol::object::Message& _msg);

View File

@ -9,7 +9,7 @@
#include <test/debug.h>
int32_t appl::getLogId(void) {
int32_t appl::getLogId() {
static int32_t g_val = etk::log::registerInstance("ea-fx TT");
return g_val;
}

View File

@ -12,7 +12,7 @@
#include <etk/log.h>
namespace appl {
int32_t getLogId(void);
int32_t getLogId();
};
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define APPL_BASE(info,data) \