diff --git a/river/io/NodeAEC.cpp b/river/io/NodeAEC.cpp index 1a83863..f453724 100644 --- a/river/io/NodeAEC.cpp +++ b/river/io/NodeAEC.cpp @@ -231,24 +231,6 @@ void river::io::NodeAEC::stop() { } } -namespace std { - static std::ostream& operator <<(std::ostream& _os, const std11::chrono::system_clock::time_point& _obj) { - std11::chrono::nanoseconds ns = std11::chrono::duration_cast(_obj.time_since_epoch()); - int64_t totalSecond = ns.count()/1000000000; - int64_t millisecond = (ns.count()%1000000000)/1000000; - int64_t microsecond = (ns.count()%1000000)/1000; - int64_t nanosecond = ns.count()%1000; - //_os << totalSecond << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns"; - - int32_t second = totalSecond % 60; - int32_t minute = (totalSecond/60)%60; - int32_t hour = (totalSecond/3600)%24; - int32_t day = (totalSecond/(24*3600))%365; - int32_t year = totalSecond/(24*3600*365); - _os << year << "y " << day << "d " << hour << "h" << minute << ":"<< second << "s " << millisecond << "ms " << microsecond << "µs " << nanosecond << "ns"; - return _os; - } -} #define SAVE_FILE_MACRO(type,fileName,dataPointer,nbElement) \ do { \ static FILE *pointerOnFile = nullptr; \ diff --git a/river/io/NodeAirTAudio.cpp b/river/io/NodeAirTAudio.cpp index 64d5ff1..7ebde54 100644 --- a/river/io/NodeAirTAudio.cpp +++ b/river/io/NodeAirTAudio.cpp @@ -23,15 +23,6 @@ static std::string asString(const std11::chrono::system_clock::time_point& tp) { return ts; } -namespace std { - static std::ostream& operator <<(std::ostream& _os, const std11::chrono::system_clock::time_point& _obj) { - std11::chrono::microseconds us = std11::chrono::duration_cast(_obj.time_since_epoch()); - _os << us.count(); - return _os; - } -} - - int32_t river::io::NodeAirTAudio::duplexCallback(const void* _inputBuffer, const std11::chrono::system_clock::time_point& _timeInput, void* _outputBuffer, @@ -118,30 +109,40 @@ river::io::NodeAirTAudio::NodeAirTAudio(const std::string& _name, const std11::s RIVER_INFO(" m_map=" << hardwareFormat.getMap()); RIVER_INFO(" m_format=" << hardwareFormat.getFormat()); RIVER_INFO(" m_isInput=" << m_isInput); - int32_t deviceId = 0; + int32_t deviceId = -1; + // TODO : Remove this from here (create an extern interface ...) RIVER_INFO("Device list:"); for (int32_t iii=0; iii