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

[DEV] update of external of elog and ethread

Browse Source
This commit is contained in:
Edouard DUPIN 2016-03-08 21:29:34 +01:00
parent b8e25e488e
commit 686682c40b
7 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
audio/Duration.cpp
View File

@ -10,37 +10,37 @@
#include <audio/debug.h> #include <audio/debug.h>
audio::Duration::Duration(int _val) { audio::Duration::Duration(int _val) {
m_data = std11::chrono::nanoseconds(_val); m_data = std::chrono::nanoseconds(_val);
} }
audio::Duration::Duration(int64_t _valSec, int64_t _valNano) { audio::Duration::Duration(int64_t _valSec, int64_t _valNano) {
m_data = std11::chrono::duration_cast<std11::chrono::nanoseconds>(std11::chrono::seconds(_valSec)); m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(_valSec));
m_data += std11::chrono::nanoseconds(_valNano); m_data += std::chrono::nanoseconds(_valNano);
} }
audio::Duration::Duration(int64_t _val) { audio::Duration::Duration(int64_t _val) {
m_data = std11::chrono::nanoseconds(_val); m_data = std::chrono::nanoseconds(_val);
} }
audio::Duration::Duration(double _val) { audio::Duration::Duration(double _val) {
m_data = std11::chrono::duration_cast<std11::chrono::nanoseconds>(std11::chrono::seconds(int64_t(_val))); m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::seconds(int64_t(_val)));
m_data += std11::chrono::nanoseconds(int64_t(((_val - int64_t(_val)) * 1000000000.0))); m_data += std::chrono::nanoseconds(int64_t(((_val - int64_t(_val)) * 1000000000.0)));
} }
audio::Duration::Duration(std11::chrono::nanoseconds _val) { audio::Duration::Duration(std::chrono::nanoseconds _val) {
m_data = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_val); m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
} }
audio::Duration::Duration(std11::chrono::microseconds _val) { audio::Duration::Duration(std::chrono::microseconds _val) {
m_data = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_val); m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
} }
audio::Duration::Duration(std11::chrono::milliseconds _val) { audio::Duration::Duration(std::chrono::milliseconds _val) {
m_data = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_val); m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
} }
audio::Duration::Duration(std11::chrono::seconds _val) { audio::Duration::Duration(std::chrono::seconds _val) {
m_data = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_val); m_data = std::chrono::duration_cast<std::chrono::nanoseconds>(_val);
} }
int64_t audio::Duration::count() const { int64_t audio::Duration::count() const {
@ -89,20 +89,20 @@ audio::Duration audio::Duration::operator- (const audio::Duration& _obj) const {
} }
audio::Duration& audio::Duration::operator++() { audio::Duration& audio::Duration::operator++() {
m_data += std11::chrono::nanoseconds(1); m_data += std::chrono::nanoseconds(1);
return *this; return *this;
} }
audio::Duration audio::Duration::operator++(int _unused) { audio::Duration audio::Duration::operator++(int _unused) {
audio::Duration result(m_data); audio::Duration result(m_data);
m_data += std11::chrono::nanoseconds(1); m_data += std::chrono::nanoseconds(1);
return result; return result;
} }
audio::Duration& audio::Duration::operator--() { audio::Duration& audio::Duration::operator--() {
m_data -= std11::chrono::nanoseconds(1); m_data -= std::chrono::nanoseconds(1);
return *this; return *this;
} }
audio::Duration audio::Duration::operator--(int _unused) { audio::Duration audio::Duration::operator--(int _unused) {
m_data -= std11::chrono::nanoseconds(1); m_data -= std::chrono::nanoseconds(1);
audio::Duration result(m_data); audio::Duration result(m_data);
return result; return result;
} }

12
audio/Duration.h
View File

@ -11,20 +11,20 @@
namespace audio { namespace audio {
class Duration { class Duration {
private: private:
std11::chrono::nanoseconds m_data; std::chrono::nanoseconds m_data;
public: public:
Duration() { }; Duration() { };
Duration(int _val); //value in nanosecond Duration(int _val); //value in nanosecond
Duration(int64_t _val); //value in nanosecond Duration(int64_t _val); //value in nanosecond
Duration(int64_t _valSec, int64_t _valNano); //value in second and nanosecond Duration(int64_t _valSec, int64_t _valNano); //value in second and nanosecond
Duration(double _val); //value in second Duration(double _val); //value in second
Duration(std11::chrono::nanoseconds _val); Duration(std::chrono::nanoseconds _val);
Duration(std11::chrono::microseconds _val); Duration(std::chrono::microseconds _val);
Duration(std11::chrono::milliseconds _val); Duration(std::chrono::milliseconds _val);
Duration(std11::chrono::seconds _val); Duration(std::chrono::seconds _val);
~Duration() { }; ~Duration() { };
int64_t count() const; int64_t count() const;
const std11::chrono::nanoseconds& get() const { const std::chrono::nanoseconds& get() const {
return m_data; return m_data;
} }
const Duration& operator= (const Duration& _obj); const Duration& operator= (const Duration& _obj);

18
audio/Time.cpp
View File

@ -10,15 +10,15 @@
#include <audio/debug.h> #include <audio/debug.h>
audio::Time::Time(int64_t _valSec, int64_t _valNano) { audio::Time::Time(int64_t _valSec, int64_t _valNano) {
m_data = std11::chrono::steady_clock::time_point(std11::chrono::seconds(_valSec)); m_data = std::chrono::steady_clock::time_point(std::chrono::seconds(_valSec));
m_data += std11::chrono::nanoseconds(_valNano); m_data += std::chrono::nanoseconds(_valNano);
} }
audio::Time::Time(const std11::chrono::steady_clock::time_point& _val) { audio::Time::Time(const std::chrono::steady_clock::time_point& _val) {
m_data = _val; m_data = _val;
} }
audio::Time audio::Time::now() { audio::Time audio::Time::now() {
return audio::Time(std11::chrono::steady_clock::now()); return audio::Time(std::chrono::steady_clock::now());
} }
const audio::Time& audio::Time::operator= (const audio::Time& _obj) { const audio::Time& audio::Time::operator= (const audio::Time& _obj) {
@ -52,7 +52,7 @@ bool audio::Time::operator>= (const audio::Time& _obj) const {
const audio::Time& audio::Time::operator+= (const audio::Duration& _obj) { const audio::Time& audio::Time::operator+= (const audio::Duration& _obj) {
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs) #if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
std11::chrono::microseconds ms = std11::chrono::duration_cast<std11::chrono::microseconds>(_obj.get()); std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
m_data += ms; m_data += ms;
#else #else
m_data += _obj.get(); m_data += _obj.get();
@ -68,7 +68,7 @@ audio::Time audio::Time::operator+ (const audio::Duration& _obj) const {
const audio::Time& audio::Time::operator-= (const audio::Duration& _obj) { const audio::Time& audio::Time::operator-= (const audio::Duration& _obj) {
#if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs) #if defined(__TARGET_OS__MacOs) || defined(__TARGET_OS__IOs)
std11::chrono::microseconds ms = std11::chrono::duration_cast<std11::chrono::microseconds>(_obj.get()); std::chrono::microseconds ms = std::chrono::duration_cast<std::chrono::microseconds>(_obj.get());
m_data -= ms; m_data -= ms;
#else #else
m_data -= _obj.get(); m_data -= _obj.get();
@ -83,15 +83,15 @@ audio::Time audio::Time::operator- (const audio::Duration& _obj) const {
} }
audio::Duration audio::Time::operator- (const audio::Time& _obj) const { audio::Duration audio::Time::operator- (const audio::Time& _obj) const {
std11::chrono::nanoseconds ns = std11::chrono::duration_cast<std11::chrono::nanoseconds>(m_data.time_since_epoch()); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(m_data.time_since_epoch());
std11::chrono::nanoseconds ns2 = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_obj.m_data.time_since_epoch()); std::chrono::nanoseconds ns2 = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.m_data.time_since_epoch());
audio::Duration duration(ns); audio::Duration duration(ns);
audio::Duration duration2(ns2); audio::Duration duration2(ns2);
return duration - duration2; return duration - duration2;
} }
std::ostream& audio::operator <<(std::ostream& _os, const audio::Time& _obj) { std::ostream& audio::operator <<(std::ostream& _os, const audio::Time& _obj) {
std11::chrono::nanoseconds ns = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_obj.get().time_since_epoch()); std::chrono::nanoseconds ns = std::chrono::duration_cast<std::chrono::nanoseconds>(_obj.get().time_since_epoch());
int64_t totalSecond = ns.count()/1000000000; int64_t totalSecond = ns.count()/1000000000;
int64_t millisecond = (ns.count()%1000000000)/1000000; int64_t millisecond = (ns.count()%1000000000)/1000000;
int64_t microsecond = (ns.count()%1000000)/1000; int64_t microsecond = (ns.count()%1000000)/1000;

6
audio/Time.h
View File

@ -13,14 +13,14 @@ namespace audio {
class Duration; class Duration;
class Time { class Time {
private: private:
std11::chrono::steady_clock::time_point m_data; std::chrono::steady_clock::time_point m_data;
public: public:
Time() {}; Time() {};
//Time(const audio::Duration& _val) {}; //value in second //Time(const audio::Duration& _val) {}; //value in second
Time(int64_t _valSec, int64_t _valNano); Time(int64_t _valSec, int64_t _valNano);
Time(const std11::chrono::steady_clock::time_point& _val); Time(const std::chrono::steady_clock::time_point& _val);
~Time() {}; ~Time() {};
const std11::chrono::steady_clock::time_point& get() const { const std::chrono::steady_clock::time_point& get() const {
return m_data; return m_data;
} }
static Time now(); static Time now();

2
audio/debug.cpp
View File

@ -8,6 +8,6 @@
int32_t audio::getLogId() { int32_t audio::getLogId() {
static int32_t g_val = etk::log::registerInstance("audio"); static int32_t g_val = elog::registerInstance("audio");
return g_val; return g_val;
} }

4
audio/debug.h
View File

@ -5,13 +5,13 @@
*/ */
#pragma once #pragma once
#include <etk/log.h> #include <elog/log.h>
namespace audio { namespace audio {
int32_t getLogId(); int32_t getLogId();
}; };
// TODO : Review this problem of multiple intanciation of "std::stringbuf sb" // TODO : Review this problem of multiple intanciation of "std::stringbuf sb"
#define AUDIO_BASE(info,data) TK_LOG_BASE(audio::getLogId(),info,data) #define AUDIO_BASE(info,data) ELOG_BASE(audio::getLogId(),info,data)
#define AUDIO_CRITICAL(data) AUDIO_BASE(1, data) #define AUDIO_CRITICAL(data) AUDIO_BASE(1, data)
#define AUDIO_ERROR(data) AUDIO_BASE(2, data) #define AUDIO_ERROR(data) AUDIO_BASE(2, data)

1
audio/format.cpp
View File

@ -6,6 +6,7 @@
#include <audio/debug.h> #include <audio/debug.h>
#include <audio/format.h> #include <audio/format.h>
#include <etk/stdTools.h>
static const char* listValues[] = { static const char* listValues[] = {
"unknow", "unknow",