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

[DEV] correct version of CPP

Browse Source
This commit is contained in:
Edouard DUPIN 2015-02-25 22:05:00 +01:00
parent 1d5ac5fecb
commit 1e8794e576
2 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtaudio/api/Alsa.cpp
View File

@ -301,7 +301,7 @@ probeParameters:
} }
// Test our discrete set of sample rate values. // Test our discrete set of sample rate values.
info.sampleRates.clear(); info.sampleRates.clear();
#if __cplusplus >= 201103L #if __CPP_VERSION__ >= 2011
for (auto &it : airtaudio::genericSampleRate()) { for (auto &it : airtaudio::genericSampleRate()) {
if (snd_pcm_hw_params_test_rate(phandle, params, it, 0) == 0) { if (snd_pcm_hw_params_test_rate(phandle, params, it, 0) == 0) {
info.sampleRates.push_back(it); info.sampleRates.push_back(it);
@ -937,7 +937,7 @@ void airtaudio::api::Alsa::callbackEvent() {
namespace std { namespace std {
static std::ostream& operator <<(std::ostream& _os, const std11::chrono::system_clock::time_point& _obj) { static std::ostream& operator <<(std::ostream& _os, const std11::chrono::system_clock::time_point& _obj) {
#if __cplusplus >= 201103L #if __CPP_VERSION__ >= 2011
std11::chrono::nanoseconds ns = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_obj.time_since_epoch()); std11::chrono::nanoseconds ns = std11::chrono::duration_cast<std11::chrono::nanoseconds>(_obj.time_since_epoch());
#else #else
boost::chrono::nanoseconds ns = boost::chrono::duration_cast<boost::chrono::nanoseconds>(_obj.time_since_epoch()); boost::chrono::nanoseconds ns = boost::chrono::duration_cast<boost::chrono::nanoseconds>(_obj.time_since_epoch());

22
airtaudio/base.h
View File

@ -7,22 +7,12 @@
#ifndef __AIRTAUDIO_CB_H__ #ifndef __AIRTAUDIO_CB_H__
#define __AIRTAUDIO_CB_H__ #define __AIRTAUDIO_CB_H__
#include <etk/thread.h>
#if __cplusplus >= 201103L #include <etk/condition_variable.h>
#include <thread> #include <etk/mutex.h>
#include <condition_variable> #include <etk/chrono.h>
#include <mutex> #include <etk/functional.h>
#include <chrono> #include <etk/memory.h>
#include <functional>
#include <memory>
#else
#include <etk/thread.h>
#include <etk/condition_variable.h>
#include <etk/mutex.h>
#include <etk/chrono.h>
#include <etk/functional.h>
#include <etk/memory.h>
#endif
#include <audio/channel.h> #include <audio/channel.h>
#include <audio/format.h> #include <audio/format.h>
#include <airtaudio/error.h> #include <airtaudio/error.h>