diff --git a/airtio/Interface.cpp b/airtio/Interface.cpp index f01269c..5c04778 100644 --- a/airtio/Interface.cpp +++ b/airtio/Interface.cpp @@ -45,21 +45,21 @@ bool airtio::Interface::init(const std::string& _name, if (m_node->isInput() == true) { // TODO : Set an auto update of IO if (m_map != m_node->getMap()) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::ChannelReorder::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_node->getMap(), m_node->getFormat(), m_node->getFrequency())); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_node->getFrequency())); m_process->pushBack(algo); AIRTIO_INFO("convert " << m_node->getMap() << " -> " << m_map); } if (m_freq != m_node->getFrequency()) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::Resampler::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_node->getFrequency())); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_freq)); m_process->pushBack(algo); AIRTIO_INFO("convert " << m_node->getFrequency() << " -> " << m_freq); } if (m_format != m_node->getFormat()) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::FormatUpdate::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); m_process->pushBack(algo); @@ -67,7 +67,7 @@ bool airtio::Interface::init(const std::string& _name, } // by default we add a read node if (true) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::EndPointRead::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); m_process->pushBack(algo); @@ -76,7 +76,7 @@ bool airtio::Interface::init(const std::string& _name, } else { // by default we add a write node: if (true) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::EndPointWrite::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); m_process->pushBack(algo); @@ -84,21 +84,21 @@ bool airtio::Interface::init(const std::string& _name, } // TODO : Set an auto update of IO if (m_format != m_node->getFormat()) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::FormatUpdate::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_freq)); m_process->pushBack(algo); AIRTIO_INFO("convert " << m_format << " -> " << m_node->getFormat()); } if (m_freq != m_node->getFrequency()) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::Resampler::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_node->getFrequency())); m_process->pushBack(algo); AIRTIO_INFO("convert " << m_freq << " -> " << m_node->getFrequency()); } if (m_map != m_node->getMap()) { - std::shared_ptr algo = std::make_shared(); + std::shared_ptr algo = airtalgo::ChannelReorder::create(); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_node->getFormat(), m_node->getFrequency())); algo->setOutputFormat(airtalgo::IOFormatInterface(m_node->getMap(), m_node->getFormat(), m_node->getFrequency())); m_process->pushBack(algo); @@ -130,7 +130,7 @@ airtio::Interface::~Interface() { void airtio::Interface::setOutputCallback(size_t _chunkSize, airtalgo::needDataFunction _function) { std::unique_lock lock(m_mutex); m_process->removeIfFirst(); - std::shared_ptr algo = std::make_shared(_function); + std::shared_ptr algo = airtalgo::EndPointCallback::create(_function); AIRTIO_INFO("set property: " << m_map << " " << m_format << " " << m_freq); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); @@ -140,7 +140,7 @@ void airtio::Interface::setOutputCallback(size_t _chunkSize, airtalgo::needDataF void airtio::Interface::setInputCallback(size_t _chunkSize, airtalgo::haveNewDataFunction _function) { std::unique_lock lock(m_mutex); m_process->removeIfLast(); - std::shared_ptr algo = std::make_shared(_function); + std::shared_ptr algo = airtalgo::EndPointCallback::create(_function); algo->setInputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); algo->setOutputFormat(airtalgo::IOFormatInterface(m_map, m_format, m_freq)); m_process->pushBack(algo); diff --git a/airtio/io/Node.cpp b/airtio/io/Node.cpp index 5bf0ae5..3bbe74f 100644 --- a/airtio/io/Node.cpp +++ b/airtio/io/Node.cpp @@ -119,13 +119,13 @@ airtio::io::Node::Node(const std::string& _streamName, bool _isInput) : // display property : { AIRTIO_INFO("Device " << deviceId << " property :"); - AIRTIO_INFO(" probe=" << (m_info.probed==true?"true":"false")); + AIRTIO_INFO(" probe=" << m_info.probed); AIRTIO_INFO(" name=" << m_info.name); AIRTIO_INFO(" outputChannels=" << m_info.outputChannels); AIRTIO_INFO(" inputChannels=" << m_info.inputChannels); AIRTIO_INFO(" duplexChannels=" << m_info.duplexChannels); - AIRTIO_INFO(" isDefaultOutput=" << (m_info.isDefaultOutput==true?"true":"false")); - AIRTIO_INFO(" isDefaultInput=" << (m_info.isDefaultInput==true?"true":"false")); + AIRTIO_INFO(" isDefaultOutput=" << m_info.isDefaultOutput); + AIRTIO_INFO(" isDefaultInput=" << m_info.isDefaultInput); //std::string rrate; std::stringstream rrate; for (int32_t jjj=0; jjj