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

[DEV] continue removing STL

Browse Source
This commit is contained in:
Edouard DUPIN 2017-09-14 00:59:21 +02:00
parent 57adfb43c8
commit 3e2ef8ce59
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/drain/Algo.cpp
View File

@ -4,7 +4,7 @@
* @license MPL v2.0 (see license file) * @license MPL v2.0 (see license file)
*/ */
#include <audio/drain/Algo.hpp> #include <audio/drain/Algo.hpp>
#include <functional> #include <etk/Function.hpp>
#include "debug.hpp" #include "debug.hpp"
audio::drain::Algo::Algo() : audio::drain::Algo::Algo() :

2
audio/drain/Algo.hpp
View File

@ -11,7 +11,7 @@
#include <audio/format.hpp> #include <audio/format.hpp>
#include <audio/channel.hpp> #include <audio/channel.hpp>
#include <chrono> #include <chrono>
#include <functional> #include <etk/Function.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include "AutoLogInOut.hpp" #include "AutoLogInOut.hpp"
#include "IOFormatInterface.hpp" #include "IOFormatInterface.hpp"

2
audio/drain/EndPointCallback.hpp
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <audio/drain/EndPoint.hpp> #include <audio/drain/EndPoint.hpp>
#include <functional> #include <etk/Function.hpp>
namespace audio { namespace audio {
namespace drain { namespace drain {

4
audio/drain/EndPointWrite.cpp
View File

@ -70,7 +70,7 @@ bool audio::drain::EndPointWrite::process(audio::Time& _time,
// set output pointer: // set output pointer:
_outputNbChunk = m_outputData.size()/(m_formatSize*m_output.getMap().size()); _outputNbChunk = m_outputData.size()/(m_formatSize*m_output.getMap().size());
_output = &m_outputData[0]; _output = &m_outputData[0];
std::unique_lock<ethread::Mutex> lock(m_mutex); ethread::UniqueLock lock(m_mutex);
// check if data in the tmpBuffer // check if data in the tmpBuffer
if (m_buffer.getSize() == 0) { if (m_buffer.getSize() == 0) {
if (m_bufferUnderFlowSize == 0) { if (m_bufferUnderFlowSize == 0) {
@ -110,7 +110,7 @@ bool audio::drain::EndPointWrite::process(audio::Time& _time,
} }
void audio::drain::EndPointWrite::write(const void* _value, size_t _nbChunk) { void audio::drain::EndPointWrite::write(const void* _value, size_t _nbChunk) {
std::unique_lock<ethread::Mutex> lock(m_mutex); ethread::UniqueLock lock(m_mutex);
DRAIN_VERBOSE("[ASYNC] Write data : " << _nbChunk << " chunks" << " ==> " << m_output); DRAIN_VERBOSE("[ASYNC] Write data : " << _nbChunk << " chunks" << " ==> " << m_output);
int32_t nbOverflow = m_buffer.write(_value, _nbChunk); int32_t nbOverflow = m_buffer.write(_value, _nbChunk);
if (nbOverflow > 0) { if (nbOverflow > 0) {

2
audio/drain/EndPointWrite.hpp
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <audio/drain/EndPoint.hpp> #include <audio/drain/EndPoint.hpp>
#include <functional> #include <etk/Function.hpp>
#include <ethread/Mutex.hpp> #include <ethread/Mutex.hpp>
#include <audio/drain/CircularBuffer.hpp> #include <audio/drain/CircularBuffer.hpp>

2
audio/drain/IOFormatInterface.hpp
View File

@ -11,7 +11,7 @@
#include <audio/format.hpp> #include <audio/format.hpp>
#include <audio/channel.hpp> #include <audio/channel.hpp>
#include <chrono> #include <chrono>
#include <functional> #include <etk/Function.hpp>
#include <ememory/memory.hpp> #include <ememory/memory.hpp>
#include "AutoLogInOut.hpp" #include "AutoLogInOut.hpp"
#include "debug.hpp" #include "debug.hpp"

2
audio/drain/Process.cpp
View File

@ -439,7 +439,7 @@ bool audio::drain::Process::processIn(void* _inData,
return false; return false;
} }
static void link(etk::FSNode& _node, const etk::String& _first, const etk::String& _op, const std::string& _second, bool _isLink=true) { static void link(etk::FSNode& _node, const etk::String& _first, const etk::String& _op, const etk::String& _second, bool _isLink=true) {
if (_op == "->") { if (_op == "->") {
if (_isLink) { if (_isLink) {
_node << " " << _first << " -> " << _second << ";\n"; _node << " " << _first << " -> " << _second << ";\n";

6
tools/drainBiQuadProfiling/appl/widget/DisplayFrequency.cpp
View File

@ -83,17 +83,17 @@ void appl::widget::DisplayFrequency::onRegenerateDisplay() {
bool displayLog = true; bool displayLog = true;
for (size_t kkk=0; kkk<m_data.size(); kkk++) { for (size_t kkk=0; kkk<m_data.size(); kkk++) {
for (size_t iii=0; iii<m_data[kkk].size(); ++iii) { for (size_t iii=0; iii<m_data[kkk].size(); ++iii) {
if (std::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) { if (etk::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) {
m_gainMax = etk::max(m_gainMax, m_data[kkk][iii].second); m_gainMax = etk::max(m_gainMax, m_data[kkk][iii].second);
m_gainMin = etk::min(m_gainMin, m_data[kkk][iii].second); m_gainMin = etk::min(m_gainMin, m_data[kkk][iii].second);
} }
if (displayLog == false) { if (displayLog == false) {
if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) { if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first); m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first);
m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first); m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first);
} }
} else { } else {
if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) { if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
if (m_data[kkk][iii].first == 0) { if (m_data[kkk][iii].first == 0) {
continue; continue;
} }

6
tools/drainEqualizerProfiling/appl/widget/DisplayFrequency.cpp
View File

@ -83,18 +83,18 @@ void appl::widget::DisplayFrequency::onRegenerateDisplay() {
bool displayLog = true; bool displayLog = true;
for (size_t kkk=0; kkk<m_data.size(); kkk++) { for (size_t kkk=0; kkk<m_data.size(); kkk++) {
for (size_t iii=0; iii<m_data[kkk].size(); ++iii) { for (size_t iii=0; iii<m_data[kkk].size(); ++iii) {
if (std::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) { if (etk::abs(m_data[kkk][iii].second) != std::numeric_limits<float>::infinity()) {
m_gainMax = etk::max(m_gainMax, m_data[kkk][iii].second); m_gainMax = etk::max(m_gainMax, m_data[kkk][iii].second);
m_gainMin = etk::min(m_gainMin, m_data[kkk][iii].second); m_gainMin = etk::min(m_gainMin, m_data[kkk][iii].second);
//APPL_INFO("plop " << m_data[kkk][iii].second); //APPL_INFO("plop " << m_data[kkk][iii].second);
} }
if (displayLog == false) { if (displayLog == false) {
if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) { if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first); m_frequencyMax = etk::max(m_frequencyMax, m_data[kkk][iii].first);
m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first); m_frequencyMin = etk::min(m_frequencyMin, m_data[kkk][iii].first);
} }
} else { } else {
if (std::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) { if (etk::abs(m_data[kkk][iii].first) != std::numeric_limits<float>::infinity()) {
if (m_data[kkk][iii].first == 0) { if (m_data[kkk][iii].first == 0) {
continue; continue;
} }