[DEV] update etk null

This commit is contained in:
2018-06-19 22:13:48 +02:00
parent 9a21d57c1f
commit 965df2ee2f
29 changed files with 199 additions and 199 deletions

View File

@@ -8,18 +8,18 @@
#define TEST_SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \
do { \
static FILE *pointerOnFile = nullptr; \
static FILE *pointerOnFile = null; \
static bool errorOpen = false; \
if (pointerOnFile == nullptr) { \
if (pointerOnFile == null) { \
TEST_WARNING("open file '" << fileName << "' type=" << #type); \
pointerOnFile = fopen(fileName,"w"); \
if ( errorOpen == false \
&& pointerOnFile == nullptr) { \
&& pointerOnFile == null) { \
TEST_ERROR("ERROR OPEN file ... '" << fileName << "' type=" << #type); \
errorOpen=true; \
} \
} \
if (pointerOnFile != nullptr) { \
if (pointerOnFile != null) { \
fwrite((dataPointer), sizeof(type), (nbElement), pointerOnFile); \
/* fflush(pointerOnFile);*/ \
} \

View File

@@ -44,8 +44,8 @@ namespace river_test_aec {
channelMap,
audio::format_int16,
_output);
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -66,8 +66,8 @@ namespace river_test_aec {
channelMap,
audio::format_int16,
_input);
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -104,24 +104,24 @@ namespace river_test_aec {
m_buffer.write(_data, _nbChunk);
}
void start() {
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
m_interfaceOut->start();
m_interfaceIn->start();
}
void stop() {
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
m_manager->generateDotAll("activeProcess.dot");

View File

@@ -56,8 +56,8 @@ namespace river_test_echo_delay {
channelMap,
audio::format_int16,
"speaker");
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -76,8 +76,8 @@ namespace river_test_echo_delay {
channelMap,
audio::format_int16,
"microphone");
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -94,8 +94,8 @@ namespace river_test_echo_delay {
channelMap,
audio::format_int16,
"speaker");
if(m_interfaceFB == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceFB == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -356,16 +356,16 @@ namespace river_test_echo_delay {
}
}
void run() {
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
if(m_interfaceFB == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceFB == null) {
TEST_ERROR("null interface");
return;
}
m_interfaceOut->start();

View File

@@ -75,8 +75,8 @@ namespace river_test_format {
_format,
"speaker",
"WriteModeCallbackType");
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -144,8 +144,8 @@ namespace river_test_format {
}
}
void run() {
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->start();

View File

@@ -36,8 +36,8 @@ namespace river_test_muxer {
channelMap,
audio::format_int16,
"speaker");
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -57,8 +57,8 @@ namespace river_test_muxer {
etk::Vector<audio::channel>(),
audio::format_int16,
"microphone-muxed");
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -104,12 +104,12 @@ namespace river_test_muxer {
TEST_ERROR("Receive data ... " << _nbChunk << " map=" << _map);
}
void run() {
if(m_interfaceIn == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceIn == null) {
TEST_ERROR("null interface");
return;
}
if(m_interfaceOut == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interfaceOut == null) {
TEST_ERROR("null interface");
return;
}
m_interfaceOut->start();

View File

@@ -38,8 +38,8 @@ namespace river_test_playback_callback {
channelMap,
audio::format_int16,
_io);
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -74,8 +74,8 @@ namespace river_test_playback_callback {
}
}
void run() {
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->start();
@@ -108,7 +108,7 @@ namespace river_test_playback_callback {
TEST_INFO("test output (callback mode)");
ememory::SharedPtr<testOutCallback> process = ememory::makeShared<testOutCallback>(manager, "speaker");
ASSERT_NE(process, nullptr);
ASSERT_NE(process, null);
process->run();
process.reset();
ethread::sleepMilliSeconds((500));

View File

@@ -51,15 +51,15 @@ namespace river_test_playback_write {
m_channelMap,
audio::format_int16,
"speaker");
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->setReadwrite();
}
void run() {
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
double phase=0;
@@ -128,8 +128,8 @@ namespace river_test_playback_write {
channelMap,
audio::format_int16,
"speaker");
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->setReadwrite();
@@ -165,8 +165,8 @@ namespace river_test_playback_write {
m_interface->write(&data[0], data.size()/_map.size());
}
void run() {
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->start();

View File

@@ -47,8 +47,8 @@ namespace river_test_record_callback {
channelMap,
audio::format_int16,
_input);
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -80,8 +80,8 @@ namespace river_test_record_callback {
TEST_INFO("Get data ... average=" << int32_t(value));
}
void run() {
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->start();

View File

@@ -53,8 +53,8 @@ namespace river_test_volume {
channelMap,
audio::format_int16,
"speaker");
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
// set callback mode ...
@@ -88,8 +88,8 @@ namespace river_test_volume {
}
}
void run() {
if(m_interface == nullptr) {
TEST_ERROR("nullptr interface");
if(m_interface == null) {
TEST_ERROR("null interface");
return;
}
m_interface->start();