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

[DEV] update etk null

Browse Source
This commit is contained in:
Edouard DUPIN
2018-06-19 22:13:48 +02:00
parent 9a21d57c1f
commit 965df2ee2f
29 changed files with 199 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
audio/river/io/Group.cpp
View File

@@ -48,7 +48,7 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const etk:
#ifdef AUDIO_RIVER_BUILD_ORCHESTRA
ememory::SharedPtr<audio::river::io::NodeOrchestra> linkRef = ememory::dynamicPointerCast<audio::river::io::NodeOrchestra>(m_list[0]);
for (size_t iii=1; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
ememory::SharedPtr<audio::river::io::NodeOrchestra> link = ememory::dynamicPointerCast<audio::river::io::NodeOrchestra>(m_list[iii]);
linkRef->m_interface.isMasterOf(link->m_interface);
}
@@ -57,10 +57,10 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const etk:
}
/*
// manage Link Between Nodes :
if (m_link != nullptr) {
if (m_link != null) {
RIVER_INFO("******** START LINK ************");
ememory::SharedPtr<audio::river::io::NodeOrchestra> link = ememory::dynamicPointerCast<audio::river::io::NodeOrchestra>(m_link);
if (link == nullptr) {
if (link == null) {
RIVER_ERROR("Can not link 2 Interface with not the same type (reserved for HW interface)");
return;
}
@@ -72,7 +72,7 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const etk:
RIVER_INFO("Create Group[" << _name << "] ( END ) ___________________________");
RIVER_INFO("Group[" << _name << "] List elements : ");
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
RIVER_INFO(" " << m_list[iii]->getName());
}
}
@@ -81,7 +81,7 @@ void audio::river::io::Group::createFrom(const ejson::Document& _obj, const etk:
ememory::SharedPtr<audio::river::io::Node> audio::river::io::Group::getNode(const etk::String& _name) {
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
if (m_list[iii]->getName() == _name) {
return m_list[iii];
}
@@ -94,7 +94,7 @@ void audio::river::io::Group::start() {
RIVER_ERROR("request start ");
int32_t count = 0;
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
count += m_list[iii]->getNumberOfInterface();
}
}
@@ -102,7 +102,7 @@ void audio::river::io::Group::start() {
if (count == 1) {
RIVER_ERROR("GROUP :::::::::::: START() [START]");
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
m_list[iii]->start();
}
}
@@ -114,7 +114,7 @@ void audio::river::io::Group::stop() {
RIVER_ERROR("request stop ");
int32_t count = 0;
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
count += m_list[iii]->getNumberOfInterface();
}
}
@@ -122,7 +122,7 @@ void audio::river::io::Group::stop() {
if (count == 0) {
RIVER_ERROR("GROUP :::::::::::: STOP() [START]");
for (int32_t iii=m_list.size()-1; iii>=0; --iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
m_list[iii]->stop();
}
}
@@ -132,7 +132,7 @@ void audio::river::io::Group::stop() {
void audio::river::io::Group::generateDot(etk::FSNode& _node, bool _hardwareNode) {
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] != nullptr) {
if (m_list[iii] != null) {
if (m_list[iii]->isHarwareNode() == _hardwareNode) {
m_list[iii]->generateDot(_node);
}

2
audio/river/io/Group.hpp
View File

@@ -45,7 +45,7 @@ namespace audio {
/**
* @brief Get a node in the group (if the node is not in the group nothing append).
* @param[in] _name Name of the node requested.
* @return nullptr The node named _name was not found.
* @return null The node named _name was not found.
* @return pointer The node was find in this group.
*/
ememory::SharedPtr<audio::river::io::Node> getNode(const etk::String& _name);

32
audio/river/io/Manager.cpp
View File

@@ -186,7 +186,7 @@ ememory::SharedPtr<audio::river::io::Node> audio::river::io::Manager::getNode(co
// search in the standalone list :
for (size_t iii=0; iii<m_list.size(); ++iii) {
ememory::SharedPtr<audio::river::io::Node> tmppp = m_list[iii].lock();
if ( tmppp != nullptr
if ( tmppp != null
&& _name == tmppp->getName()) {
RIVER_WARNING(" find it ... in standalone");
return tmppp;
@@ -197,9 +197,9 @@ ememory::SharedPtr<audio::river::io::Node> audio::river::io::Manager::getNode(co
for (etk::Map<etk::String, ememory::SharedPtr<audio::river::io::Group> >::Iterator it(m_listGroup.begin());
it != m_listGroup.end();
++it) {
if (it->second != nullptr) {
if (it->second != null) {
ememory::SharedPtr<audio::river::io::Node> node = it->second->getNode(_name);
if (node != nullptr) {
if (node != null) {
RIVER_WARNING(" find it ... in group: " << it->first);
return node;
}
@@ -220,7 +220,7 @@ ememory::SharedPtr<audio::river::io::Node> audio::river::io::Manager::getNode(co
|| ioType == "PAinput"
|| ioType == "PAoutput") ) {
ememory::SharedPtr<audio::river::io::Group> tmpGroup = getGroup(groupName);
if (tmpGroup == nullptr) {
if (tmpGroup == null) {
RIVER_WARNING("Can not get group ... '" << groupName << "'");
return ememory::SharedPtr<audio::river::io::Node>();
}
@@ -274,7 +274,7 @@ ememory::SharedPtr<audio::drain::VolumeElement> audio::river::io::Manager::getVo
return ememory::SharedPtr<audio::drain::VolumeElement>();
}
for (size_t iii=0; iii<m_volumeGroup.size(); ++iii) {
if (m_volumeGroup[iii] == nullptr) {
if (m_volumeGroup[iii] == null) {
continue;
}
if (m_volumeGroup[iii]->getName() == _name) {
@@ -290,7 +290,7 @@ ememory::SharedPtr<audio::drain::VolumeElement> audio::river::io::Manager::getVo
bool audio::river::io::Manager::setVolume(const etk::String& _volumeName, float _valuedB) {
ethread::RecursiveLock lock(m_mutex);
ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
if (volume == nullptr) {
if (volume == null) {
RIVER_ERROR("Can not set volume ... : '" << _volumeName << "'");
return false;
}
@@ -302,7 +302,7 @@ bool audio::river::io::Manager::setVolume(const etk::String& _volumeName, float
volume->setVolume(_valuedB);
for (size_t iii=0; iii<m_list.size(); ++iii) {
ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
if (val != nullptr) {
if (val != null) {
val->volumeChange();
}
}
@@ -312,7 +312,7 @@ bool audio::river::io::Manager::setVolume(const etk::String& _volumeName, float
float audio::river::io::Manager::getVolume(const etk::String& _volumeName) {
ethread::RecursiveLock lock(m_mutex);
ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
if (volume == nullptr) {
if (volume == null) {
RIVER_ERROR("Can not get volume ... : '" << _volumeName << "'");
return 0.0f;
}
@@ -326,14 +326,14 @@ etk::Pair<float,float> audio::river::io::Manager::getVolumeRange(const etk::Stri
void audio::river::io::Manager::setMute(const etk::String& _volumeName, bool _mute) {
ethread::RecursiveLock lock(m_mutex);
ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
if (volume == nullptr) {
if (volume == null) {
RIVER_ERROR("Can not set volume ... : '" << _volumeName << "'");
return;
}
volume->setMute(_mute);
for (size_t iii=0; iii<m_list.size(); ++iii) {
ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
if (val != nullptr) {
if (val != null) {
val->volumeChange();
}
}
@@ -342,7 +342,7 @@ void audio::river::io::Manager::setMute(const etk::String& _volumeName, bool _mu
bool audio::river::io::Manager::getMute(const etk::String& _volumeName) {
ethread::RecursiveLock lock(m_mutex);
ememory::SharedPtr<audio::drain::VolumeElement> volume = getVolumeGroup(_volumeName);
if (volume == nullptr) {
if (volume == null) {
RIVER_ERROR("Can not get volume ... : '" << _volumeName << "'");
return false;
}
@@ -364,7 +364,7 @@ void audio::river::io::Manager::generateDot(const etk::String& _filename) {
// standalone
for (size_t iii=0; iii<m_list.size(); ++iii) {
ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
if (val != nullptr) {
if (val != null) {
if (val->isHarwareNode() == true) {
val->generateDot(node);
}
@@ -373,7 +373,7 @@ void audio::river::io::Manager::generateDot(const etk::String& _filename) {
for (etk::Map<etk::String, ememory::SharedPtr<audio::river::io::Group> >::Iterator it(m_listGroup.begin());
it != m_listGroup.end();
++it) {
if (it->second != nullptr) {
if (it->second != null) {
it->second->generateDot(node, true);
}
}
@@ -383,7 +383,7 @@ void audio::river::io::Manager::generateDot(const etk::String& _filename) {
// standalone
for (size_t iii=0; iii<m_list.size(); ++iii) {
ememory::SharedPtr<audio::river::io::Node> val = m_list[iii].lock();
if (val != nullptr) {
if (val != null) {
if (val->isHarwareNode() == false) {
val->generateDot(node);
}
@@ -392,7 +392,7 @@ void audio::river::io::Manager::generateDot(const etk::String& _filename) {
for (etk::Map<etk::String, ememory::SharedPtr<audio::river::io::Group> >::Iterator it(m_listGroup.begin());
it != m_listGroup.end();
++it) {
if (it->second != nullptr) {
if (it->second != null) {
it->second->generateDot(node, false);
}
}
@@ -410,7 +410,7 @@ ememory::SharedPtr<audio::river::io::Group> audio::river::io::Manager::getGroup(
if (it == m_listGroup.end()) {
RIVER_INFO("Create a new group: " << _name << " (START)");
out = ememory::makeShared<audio::river::io::Group>();
if (out != nullptr) {
if (out != null) {
out->createFrom(m_config, _name);
m_listGroup.add(_name, out);
RIVER_INFO("Create a new group: " << _name << " ( END )");

6
audio/river/io/Manager.hpp
View File

@@ -62,7 +62,7 @@ namespace audio {
/**
* @brief Get a node with his name (the name is set in the description file.
* @param[in] _name Name of the node
* @return Pointer on the noe or a nullptr if the node does not exist in the file or an error occured.
* @return Pointer on the noe or a null if the node does not exist in the file or an error occured.
*/
ememory::SharedPtr<audio::river::io::Node> getNode(const etk::String& _name);
private:
@@ -71,7 +71,7 @@ namespace audio {
/**
* @brief Get a volume in the global list of vilume
* @param[in] _name Name of the volume.
* @return pointer on the requested volume (create it if does not exist). nullptr if the name is empty.
* @return pointer on the requested volume (create it if does not exist). null if the name is empty.
*/
ememory::SharedPtr<audio::drain::VolumeElement> getVolumeGroup(const etk::String& _name);
/**
@@ -140,7 +140,7 @@ namespace audio {
/**
* @brief get a low level interface group.
* @param[in] _name Name of the group.
* @return Pointer on the requested group or nullptr if the group does not existed.
* @return Pointer on the requested group or null if the group does not existed.
*/
ememory::SharedPtr<audio::river::io::Group> getGroup(const etk::String& _name);

42
audio/river/io/Node.cpp
View File

@@ -110,7 +110,7 @@ audio::river::io::Node::~Node() {
size_t audio::river::io::Node::getNumberOfInterface(enum audio::river::modeInterface _interfaceType) {
size_t out = 0;
for (size_t iii=0; iii<m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() == _interfaceType) {
@@ -123,7 +123,7 @@ size_t audio::river::io::Node::getNumberOfInterfaceAvaillable(enum audio::river:
size_t out = 0;
for (size_t iii=0; iii<m_listAvaillable.size(); ++iii) {
auto element = m_listAvaillable[iii].lock();
if (element == nullptr) {
if (element == null) {
continue;
}
if (element->getMode() == _interfaceType) {
@@ -181,7 +181,7 @@ void audio::river::io::Node::interfaceRemove(const ememory::SharedPtr<audio::riv
void audio::river::io::Node::volumeChange() {
for (size_t iii=0; iii< m_listAvaillable.size(); ++iii) {
auto node = m_listAvaillable[iii].lock();
if (node != nullptr) {
if (node != null) {
node->systemVolumeChange();
}
}
@@ -190,11 +190,11 @@ void audio::river::io::Node::volumeChange() {
void audio::river::io::Node::newInput(const void* _inputBuffer,
uint32_t _nbChunk,
const audio::Time& _time) {
if (_inputBuffer == nullptr) {
if (_inputBuffer == null) {
return;
}
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_input) {
@@ -210,7 +210,7 @@ void audio::river::io::Node::newInput(const void* _inputBuffer,
void audio::river::io::Node::newOutput(void* _outputBuffer,
uint32_t _nbChunk,
const audio::Time& _time) {
if (_outputBuffer == nullptr) {
if (_outputBuffer == null) {
return;
}
enum audio::format muxerFormatType = m_process.getInputConfig().getFormat();
@@ -228,9 +228,9 @@ void audio::river::io::Node::newOutput(void* _outputBuffer,
RIVER_VERBOSE("resize=" << _nbChunk*m_process.getInputConfig().getMap().size());
output.resize(_nbChunk*m_process.getInputConfig().getMap().size(), 0);
// $$$$ change the int16
const int16_t* outputTmp = nullptr;
const int16_t* outputTmp = null;
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_output) {
@@ -260,9 +260,9 @@ void audio::river::io::Node::newOutput(void* _outputBuffer,
etk::Vector<int32_t> output;
RIVER_VERBOSE("resize=" << _nbChunk*m_process.getInputConfig().getMap().size());
output.resize(_nbChunk*m_process.getInputConfig().getMap().size(), 0);
const int32_t* outputTmp = nullptr;
const int32_t* outputTmp = null;
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_output) {
@@ -290,9 +290,9 @@ void audio::river::io::Node::newOutput(void* _outputBuffer,
etk::Vector<int64_t> output;
RIVER_VERBOSE("resize=" << _nbChunk*m_process.getInputConfig().getMap().size());
output.resize(_nbChunk*m_process.getInputConfig().getMap().size(), 0);
const int64_t* outputTmp = nullptr;
const int64_t* outputTmp = null;
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_output) {
@@ -320,9 +320,9 @@ void audio::river::io::Node::newOutput(void* _outputBuffer,
etk::Vector<float> output;
RIVER_VERBOSE("resize=" << _nbChunk*m_process.getInputConfig().getMap().size());
output.resize(_nbChunk*m_process.getInputConfig().getMap().size(), 0);
const float* outputTmp = nullptr;
const float* outputTmp = null;
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_output) {
@@ -349,9 +349,9 @@ void audio::river::io::Node::newOutput(void* _outputBuffer,
etk::Vector<double> output;
RIVER_VERBOSE("resize=" << _nbChunk*m_process.getInputConfig().getMap().size());
output.resize(_nbChunk*m_process.getInputConfig().getMap().size(), 0);
const double* outputTmp = nullptr;
const double* outputTmp = null;
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_output) {
@@ -378,7 +378,7 @@ void audio::river::io::Node::newOutput(void* _outputBuffer,
// The feedback get the real output data (after processing ...==> then no nneed to specify for each channels
RIVER_VERBOSE(" Feedback :");
for (size_t iii=0; iii< m_list.size(); ++iii) {
if (m_list[iii] == nullptr) {
if (m_list[iii] == null) {
continue;
}
if (m_list[iii]->getMode() != audio::river::modeInterface_feedback) {
@@ -454,7 +454,7 @@ void audio::river::io::Node::generateDot(etk::FSNode& _node) {
continue;
}
ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
if (element == nullptr) {
if (element == null) {
continue;
}
bool isLink = false;
@@ -463,7 +463,7 @@ void audio::river::io::Node::generateDot(etk::FSNode& _node) {
isLink = true;
}
}
if (element != nullptr) {
if (element != null) {
if (element->getMode() == modeInterface_input) {
element->generateDot(_node, "NODE_" + etk::toString(m_uid) + "_demuxer", isLink);
} else if (element->getMode() == modeInterface_output) {
@@ -480,7 +480,7 @@ void audio::river::io::Node::generateDot(etk::FSNode& _node) {
void audio::river::io::Node::startInGroup() {
ememory::SharedPtr<audio::river::io::Group> group = m_group.lock();
if (group != nullptr) {
if (group != null) {
group->start();
} else {
start();
@@ -489,7 +489,7 @@ void audio::river::io::Node::startInGroup() {
void audio::river::io::Node::stopInGroup() {
ememory::SharedPtr<audio::river::io::Group> group = m_group.lock();
if (group != nullptr) {
if (group != null) {
group->stop();
} else {
stop();

22
audio/river/io/NodeAEC.cpp
View File

@@ -42,7 +42,7 @@ ememory::SharedPtr<audio::river::Interface> audio::river::io::NodeAEC::createInp
// create user iterface:
ememory::SharedPtr<audio::river::Interface> interface;
interface = audio::river::Interface::create(_freq, _map, _format, node, tmppp);
if (interface != nullptr) {
if (interface != null) {
interface->setName(_name);
}
return interface;
@@ -87,7 +87,7 @@ audio::river::io::NodeAEC::NodeAEC(const etk::String& _name, const ejson::Object
hardwareFormat.getFormat(),
"map-on-feedback",
_name + "-AEC-feedback");
if (m_interfaceFeedBack == nullptr) {
if (m_interfaceFeedBack == null) {
RIVER_ERROR("Can not opne virtual device ... map-on-feedback in " << _name);
return;
}
@@ -97,7 +97,7 @@ audio::river::io::NodeAEC::NodeAEC(const etk::String& _name, const ejson::Object
hardwareFormat.getFormat(),
"map-on-microphone",
_name + "-AEC-microphone");
if (m_interfaceMicrophone == nullptr) {
if (m_interfaceMicrophone == null) {
RIVER_ERROR("Can not opne virtual device ... map-on-microphone in " << _name);
return;
}
@@ -140,11 +140,11 @@ audio::river::io::NodeAEC::~NodeAEC() {
void audio::river::io::NodeAEC::start() {
ethread::UniqueLock lock(m_mutex);
RIVER_INFO("Start stream : '" << m_name << "' mode=" << (m_isInput?"input":"output") );
if (m_interfaceFeedBack != nullptr) {
if (m_interfaceFeedBack != null) {
RIVER_INFO("Start FEEDBACK : ");
m_interfaceFeedBack->start();
}
if (m_interfaceMicrophone != nullptr) {
if (m_interfaceMicrophone != null) {
RIVER_INFO("Start Microphone : ");
m_interfaceMicrophone->start();
}
@@ -152,10 +152,10 @@ void audio::river::io::NodeAEC::start() {
void audio::river::io::NodeAEC::stop() {
ethread::UniqueLock lock(m_mutex);
if (m_interfaceFeedBack != nullptr) {
if (m_interfaceFeedBack != null) {
m_interfaceFeedBack->stop();
}
if (m_interfaceMicrophone != nullptr) {
if (m_interfaceMicrophone != null) {
m_interfaceMicrophone->stop();
}
}
@@ -330,10 +330,10 @@ void audio::river::io::NodeAEC::generateDot(etk::FSNode& _node) {
_node << " NODE_" << m_uid << "_HW_AEC -> " << nameIn << ";\n";
_node << " " << nameOut << " -> NODE_" << m_uid << "_demuxer;\n";
_node << " }\n";
if (m_interfaceMicrophone != nullptr) {
if (m_interfaceMicrophone != null) {
_node << " " << m_interfaceMicrophone->getDotNodeName() << " -> NODE_" << m_uid << "_HW_AEC;\n";
}
if (m_interfaceFeedBack != nullptr) {
if (m_interfaceFeedBack != null) {
_node << " " << m_interfaceFeedBack->getDotNodeName() << " -> NODE_" << m_uid << "_HW_AEC;\n";
}
_node << " \n";
@@ -343,7 +343,7 @@ void audio::river::io::NodeAEC::generateDot(etk::FSNode& _node) {
continue;
}
ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
if (element == nullptr) {
if (element == null) {
continue;
}
bool isLink = false;
@@ -352,7 +352,7 @@ void audio::river::io::NodeAEC::generateDot(etk::FSNode& _node) {
isLink = true;
}
}
if (element != nullptr) {
if (element != null) {
if (element->getMode() == modeInterface_input) {
element->generateDot(_node, "NODE_" + etk::toString(m_uid) + "_demuxer", isLink);
} else if (element->getMode() == modeInterface_output) {

6
audio/river/io/NodeFile.cpp
View File

@@ -197,7 +197,7 @@ audio::river::io::NodeFile::NodeFile(const etk::String& _name, const ejson::Obje
if (m_isInput == true) {
m_process.setInputConfig(hardwareFormat);
m_process.setOutputConfig(interfaceFormat);
err = m_interface.openStream(nullptr,
err = m_interface.openStream(null,
&params,
hardwareFormat.getFormat(),
hardwareFormat.getFrequency(),
@@ -217,7 +217,7 @@ audio::river::io::NodeFile::NodeFile(const etk::String& _name, const ejson::Obje
m_process.setInputConfig(interfaceFormat);
m_process.setOutputConfig(hardwareFormat);
err = m_interface.openStream(&params,
nullptr,
null,
hardwareFormat.getFormat(),
hardwareFormat.getFrequency(),
&m_rtaudioFrameSize,
@@ -259,7 +259,7 @@ void audio::river::io::NodeFile::threadCallback() {
void audio::river::io::NodeFile::start() {
ethread::UniqueLock lock(m_mutex);
if (m_thread != nullptr) {
if (m_thread != null) {
RIVER_ERROR("Start stream : '" << m_name << "' mode=" << (m_isInput?"read":"write") << " ==> already started ..." );
return;
}

22
audio/river/io/NodeMuxer.cpp
View File

@@ -42,7 +42,7 @@ ememory::SharedPtr<audio::river::Interface> audio::river::io::NodeMuxer::createI
// create user iterface:
ememory::SharedPtr<audio::river::Interface> interface;
interface = audio::river::Interface::create(_freq, _map, _format, node, tmppp);
if (interface != nullptr) {
if (interface != null) {
interface->setName(_name);
}
return interface;
@@ -81,7 +81,7 @@ audio::river::io::NodeMuxer::NodeMuxer(const etk::String& _name, const ejson::Ob
hardwareFormat.getFormat(),
"map-on-input-1",
_name + "-muxer-in1");
if (m_interfaceInput1 == nullptr) {
if (m_interfaceInput1 == null) {
RIVER_ERROR("Can not opne virtual device ... map-on-input-1 in " << _name);
return;
}
@@ -107,7 +107,7 @@ audio::river::io::NodeMuxer::NodeMuxer(const etk::String& _name, const ejson::Ob
hardwareFormat.getFormat(),
"map-on-input-2",
_name + "-muxer-in2");
if (m_interfaceInput2 == nullptr) {
if (m_interfaceInput2 == null) {
RIVER_ERROR("Can not opne virtual device ... map-on-input-2 in " << _name);
return;
}
@@ -166,11 +166,11 @@ audio::river::io::NodeMuxer::~NodeMuxer() {
void audio::river::io::NodeMuxer::start() {
ethread::UniqueLock lock(m_mutex);
RIVER_INFO("Start stream : '" << m_name << "' mode=" << (m_isInput?"input":"output") );
if (m_interfaceInput1 != nullptr) {
if (m_interfaceInput1 != null) {
RIVER_INFO("Start FEEDBACK : ");
m_interfaceInput1->start();
}
if (m_interfaceInput2 != nullptr) {
if (m_interfaceInput2 != null) {
RIVER_INFO("Start Microphone : ");
m_interfaceInput2->start();
}
@@ -178,10 +178,10 @@ void audio::river::io::NodeMuxer::start() {
void audio::river::io::NodeMuxer::stop() {
ethread::UniqueLock lock(m_mutex);
if (m_interfaceInput1 != nullptr) {
if (m_interfaceInput1 != null) {
m_interfaceInput1->stop();
}
if (m_interfaceInput2 != nullptr) {
if (m_interfaceInput2 != null) {
m_interfaceInput2->stop();
}
}
@@ -450,10 +450,10 @@ void audio::river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
_node << " NODE_" << m_uid << "_HW_MUXER -> " << nameIn << ";\n";
_node << " " << nameOut << " -> NODE_" << m_uid << "_demuxer;\n";
_node << " }\n";
if (m_interfaceInput2 != nullptr) {
if (m_interfaceInput2 != null) {
_node << " " << m_interfaceInput2->getDotNodeName() << " -> NODE_" << m_uid << "_HW_MUXER;\n";
}
if (m_interfaceInput1 != nullptr) {
if (m_interfaceInput1 != null) {
_node << " " << m_interfaceInput1->getDotNodeName() << " -> NODE_" << m_uid << "_HW_MUXER;\n";
}
_node << " \n";
@@ -462,7 +462,7 @@ void audio::river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
continue;
}
ememory::SharedPtr<audio::river::Interface> element = m_listAvaillable[iii].lock();
if (element == nullptr) {
if (element == null) {
continue;
}
bool isLink = false;
@@ -471,7 +471,7 @@ void audio::river::io::NodeMuxer::generateDot(etk::FSNode& _node) {
isLink = true;
}
}
if (element != nullptr) {
if (element != null) {
if (element->getMode() == modeInterface_input) {
element->generateDot(_node, "NODE_" + etk::toString(m_uid) + "_demuxer", isLink);
} else if (element->getMode() == modeInterface_output) {

4
audio/river/io/NodeOrchestra.cpp
View File

@@ -198,7 +198,7 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const etk::String& _name, const e
if (m_isInput == true) {
m_process.setInputConfig(hardwareFormat);
m_process.setOutputConfig(interfaceFormat);
err = m_interface.openStream(nullptr,
err = m_interface.openStream(null,
&params,
hardwareFormat.getFormat(),
hardwareFormat.getFrequency(),
@@ -217,7 +217,7 @@ audio::river::io::NodeOrchestra::NodeOrchestra(const etk::String& _name, const e
m_process.setInputConfig(interfaceFormat);
m_process.setOutputConfig(hardwareFormat);
err = m_interface.openStream(&params,
nullptr,
null,
hardwareFormat.getFormat(),
hardwareFormat.getFrequency(),
&m_rtaudioFrameSize,

4
audio/river/io/NodePortAudio.cpp
View File

@@ -41,11 +41,11 @@ int32_t audio::river::io::NodePortAudio::duplexCallback(const void* _inputBuffer
PaStreamCallbackFlags _status) {
ethread::UniqueLock lock(m_mutex);
// TODO : Manage status ...
if (_inputBuffer != nullptr) {
if (_inputBuffer != null) {
RIVER_VERBOSE("data Input size request :" << _nbChunk << " [BEGIN] status=" << _status << " nbIO=" << m_list.size());
newInput(_inputBuffer, _nbChunk, _timeInput);
}
if (_outputBuffer != nullptr) {
if (_outputBuffer != null) {
RIVER_VERBOSE("data Output size request :" << _nbChunk << " [BEGIN] status=" << _status << " nbIO=" << m_list.size());
newOutput(_outputBuffer, _nbChunk, _timeOutput);
}