[DEV] continue removing STL

This commit is contained in:
2017-09-14 00:59:21 +02:00
parent 2ee24d5baa
commit c3d78cf387
23 changed files with 122 additions and 122 deletions

View File

@@ -203,7 +203,7 @@ namespace river_test_aec {
ememory::SharedPtr<Linker> processLink2 = ememory::makeShared<Linker>(manager, "microphone", "speaker-test");
processLink1->start();
processLink2->start();
std::this_thread::sleep_for(std::chrono::seconds(20));
ethread::sleepMilliSeconds(std::chrono::seconds(20));
processLink1->stop();
processLink2->stop();

View File

@@ -360,9 +360,9 @@ namespace river_test_echo_delay {
m_interfaceIn->start();
//m_interfaceFB->start();
while (m_estimateVolumeInput == true) {
std::this_thread::sleep_for(std::chrono::milliseconds(10));
ethread::sleepMilliSeconds((10));
}
std::this_thread::sleep_for(std::chrono::seconds(10));
ethread::sleepMilliSeconds(std::chrono::seconds(10));
//m_interfaceFB->stop();
m_interfaceIn->stop();
m_interfaceOut->stop();
@@ -418,7 +418,7 @@ namespace river_test_echo_delay {
ememory::SharedPtr<TestClass> process = ememory::makeShared<TestClass>(manager);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
};

View File

@@ -136,9 +136,9 @@ namespace river_test_format {
}
m_interface->start();
// wait 2 second ...
std::this_thread::sleep_for(std::chrono::seconds(1));
ethread::sleepMilliSeconds(std::chrono::seconds(1));
m_interface->stop();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
ethread::sleepMilliSeconds((100));
}
};
@@ -151,7 +151,7 @@ namespace river_test_format {
ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, GetParam(), 2, audio::format_int16);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
@@ -168,7 +168,7 @@ namespace river_test_format {
ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, 48000, 2, GetParam());
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
INSTANTIATE_TEST_CASE_P(InstantiationName,
@@ -184,7 +184,7 @@ namespace river_test_format {
ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, 48000, GetParam(), audio::format_int16);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
INSTANTIATE_TEST_CASE_P(InstantiationName,
@@ -226,7 +226,7 @@ namespace river_test_format {
ememory::SharedPtr<testOutCallbackType> process = ememory::makeShared<testOutCallbackType>(manager, listFreq[fff], listChannel[ccc], listFormat[iii]);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
}
}
}

View File

@@ -103,7 +103,7 @@ namespace river_test_muxer {
}
m_interfaceOut->start();
m_interfaceIn->start();
std::this_thread::sleep_for(std::chrono::seconds(10));
ethread::sleepMilliSeconds(std::chrono::seconds(10));
m_interfaceIn->stop();
m_interfaceOut->stop();
}
@@ -168,7 +168,7 @@ namespace river_test_muxer {
ememory::SharedPtr<TestClass> process = ememory::makeShared<TestClass>(manager);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
};

View File

@@ -66,7 +66,7 @@ namespace river_test_playback_callback {
}
m_interface->start();
// wait 2 second ...
std::this_thread::sleep_for(std::chrono::seconds(2));
ethread::sleepMilliSeconds(std::chrono::seconds(2));
m_interface->stop();
}
};
@@ -97,7 +97,7 @@ namespace river_test_playback_callback {
ASSERT_NE(process, nullptr);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
@@ -110,7 +110,7 @@ namespace river_test_playback_callback {
ememory::SharedPtr<testOutCallback> process = ememory::makeShared<testOutCallback>(manager, "speaker-pulse");
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
@@ -123,7 +123,7 @@ namespace river_test_playback_callback {
ememory::SharedPtr<testOutCallback> process = ememory::makeShared<testOutCallback>(manager, "speaker-jack");
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
};

View File

@@ -78,7 +78,7 @@ namespace river_test_playback_write {
}
m_interface->write(&data[0], data.size()/m_channelMap.size());
// TODO : Add a function to get number of time we need to wait enought time ...
std::this_thread::sleep_for(std::chrono::milliseconds(15));
ethread::sleepMilliSeconds((15));
}
m_interface->stop();
}
@@ -93,7 +93,7 @@ namespace river_test_playback_write {
ememory::SharedPtr<testOutWrite> process = ememory::makeShared<testOutWrite>(manager);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}
@@ -156,7 +156,7 @@ namespace river_test_playback_write {
return;
}
m_interface->start();
std::this_thread::sleep_for(std::chrono::seconds(1));
ethread::sleepMilliSeconds(std::chrono::seconds(1));
m_interface->stop();
}
};
@@ -170,7 +170,7 @@ namespace river_test_playback_write {
ememory::SharedPtr<testOutWriteCallback> process = ememory::makeShared<testOutWriteCallback>(manager);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}

View File

@@ -63,7 +63,7 @@ namespace river_test_record_callback {
const int16_t* data = static_cast<const int16_t*>(_data);
int64_t value = 0;
for (size_t iii=0; iii<_nbChunk*_map.size(); ++iii) {
value += std::abs(data[iii]);
value += etk::abs(data[iii]);
}
value /= (_nbChunk*_map.size());
TEST_INFO("Get data ... average=" << int32_t(value));
@@ -75,7 +75,7 @@ namespace river_test_record_callback {
}
m_interface->start();
// wait 2 second ...
std::this_thread::sleep_for(std::chrono::seconds(20));
ethread::sleepMilliSeconds(std::chrono::seconds(20));
m_interface->stop();
}
};
@@ -88,7 +88,7 @@ namespace river_test_record_callback {
ememory::SharedPtr<testInCallback> process = ememory::makeShared<testInCallback>(manager);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}

View File

@@ -79,40 +79,40 @@ namespace river_test_volume {
return;
}
m_interface->start();
std::this_thread::sleep_for(std::chrono::seconds(1));
ethread::sleepMilliSeconds(std::chrono::seconds(1));
m_interface->setParameter("volume", "FLOW", "-3dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "-6dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "-9dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "-12dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "-3dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "3dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "6dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "9dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_interface->setParameter("volume", "FLOW", "0dB");
TEST_INFO(" get volume : " << m_interface->getParameter("volume", "FLOW") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_manager->setVolume("MASTER", -3.0f);
TEST_INFO("get volume MASTER: " << m_manager->getVolume("MASTER") );
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
m_manager->setVolume("MEDIA", -3.0f);
TEST_INFO("get volume MEDIA: " << m_manager->getVolume("MEDIA") );
std::this_thread::sleep_for(std::chrono::seconds(1));
ethread::sleepMilliSeconds(std::chrono::seconds(1));
m_interface->stop();
}
};
@@ -124,7 +124,7 @@ namespace river_test_volume {
ememory::SharedPtr<testCallbackVolume> process = ememory::makeShared<testCallbackVolume>(manager);
process->run();
process.reset();
std::this_thread::sleep_for(std::chrono::milliseconds(500));
ethread::sleepMilliSeconds((500));
audio::river::unInit();
}