[DEV/API] change .h in .hpp

This commit is contained in:
Edouard DUPIN 2016-10-02 22:06:09 +02:00
parent fe23d699d1
commit 918d573f18
49 changed files with 147 additions and 147 deletions

View File

@ -5,9 +5,9 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
//#include <etk/types.h> //#include <etk/types.hpp>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>

View File

@ -7,13 +7,13 @@
#pragma once #pragma once
#include <sstream> #include <sstream>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <audio/orchestra/type.h> #include <audio/orchestra/type.hpp>
#include <audio/orchestra/state.h> #include <audio/orchestra/state.hpp>
#include <audio/orchestra/mode.h> #include <audio/orchestra/mode.hpp>
#include <audio/Time.h> #include <audio/Time.hpp>
#include <audio/Duration.h> #include <audio/Duration.hpp>
#include <ememory/memory.h> #include <ememory/memory.hpp>
/** /**
* @brief Audio library namespace * @brief Audio library namespace
*/ */

View File

@ -5,10 +5,10 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
//#include <etk/types.h> //#include <etk/types.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <audio/orchestra/DeviceInfo.h> #include <audio/orchestra/DeviceInfo.hpp>
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
#include <iostream> #include <iostream>
void audio::orchestra::DeviceInfo::display(int32_t _tabNumber) const { void audio::orchestra::DeviceInfo::display(int32_t _tabNumber) const {

View File

@ -6,8 +6,8 @@
*/ */
#pragma once #pragma once
#include <audio/format.h> #include <audio/format.hpp>
#include <audio/channel.h> #include <audio/channel.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,5 +5,5 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/Flags.h> #include <audio/orchestra/Flags.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,19 +5,19 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
//#include <etk/types.h> //#include <etk/types.hpp>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <iostream> #include <iostream>
#include <audio/orchestra/api/Alsa.h> #include <audio/orchestra/api/Alsa.hpp>
#include <audio/orchestra/api/Android.h> #include <audio/orchestra/api/Android.hpp>
#include <audio/orchestra/api/Asio.h> #include <audio/orchestra/api/Asio.hpp>
#include <audio/orchestra/api/Core.h> #include <audio/orchestra/api/Core.hpp>
#include <audio/orchestra/api/CoreIos.h> #include <audio/orchestra/api/CoreIos.hpp>
#include <audio/orchestra/api/Ds.h> #include <audio/orchestra/api/Ds.hpp>
#include <audio/orchestra/api/Dummy.h> #include <audio/orchestra/api/Dummy.hpp>
#include <audio/orchestra/api/Jack.h> #include <audio/orchestra/api/Jack.hpp>
#include <audio/orchestra/api/Pulse.h> #include <audio/orchestra/api/Pulse.hpp>
std::vector<std::string> audio::orchestra::Interface::getListApi() { std::vector<std::string> audio::orchestra::Interface::getListApi() {
std::vector<std::string> apis; std::vector<std::string> apis;

View File

@ -8,9 +8,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <audio/orchestra/base.h> #include <audio/orchestra/base.hpp>
#include <audio/orchestra/CallbackInfo.h> #include <audio/orchestra/CallbackInfo.hpp>
#include <audio/orchestra/Api.h> #include <audio/orchestra/Api.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,9 +5,9 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/StreamOptions.h> #include <audio/orchestra/StreamOptions.hpp>
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
static const char* listValue[] = { static const char* listValue[] = {
"hardware", "hardware",

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <audio/orchestra/Flags.h> #include <audio/orchestra/Flags.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -8,14 +8,14 @@
#if defined(ORCHESTRA_BUILD_ALSA) #if defined(ORCHESTRA_BUILD_ALSA)
#include <alsa/asoundlib.h> #include <alsa/asoundlib.hpp>
#include <unistd.h> #include <unistd.hpp>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
#include <ethread/tools.h> #include <ethread/tools.hpp>
#include <limits.h> #include <limits.h>
#include <audio/orchestra/api/Alsa.h> #include <audio/orchestra/api/Alsa.hpp>
extern "C" { extern "C" {
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -24,9 +24,9 @@ extern "C" {
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <sys/time.h> #include <sys/time.h>
#include <math.h>
#include <poll.h> #include <poll.h>
} }
#include <cmath>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Alsa::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Alsa::create() {
return ememory::SharedPtr<audio::orchestra::api::Alsa>(new audio::orchestra::api::Alsa()); return ememory::SharedPtr<audio::orchestra::api::Alsa>(new audio::orchestra::api::Alsa());

View File

@ -9,10 +9,10 @@
//#include <ewol/context/Context.h> //#include <ewol/context/Context.h>
#include <unistd.h> #include <unistd.h>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <audio/orchestra/api/AndroidNativeInterface.h> #include <audio/orchestra/api/AndroidNativeInterface.hpp>
#include <audio/orchestra/api/Android.h> #include <audio/orchestra/api/Android.hpp>
#include <limits.h> #include <limits.h>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Android::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Android::create() {

View File

@ -7,7 +7,7 @@
#ifdef ORCHESTRA_BUILD_JAVA #ifdef ORCHESTRA_BUILD_JAVA
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -7,15 +7,15 @@
#include <jni.h> #include <jni.h>
#include <pthread.h> #include <pthread.h>
#include <mutex> #include <mutex>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <audio/orchestra/error.h> #include <audio/orchestra/error.hpp>
#include <audio/orchestra/api/AndroidNativeInterface.h> #include <audio/orchestra/api/AndroidNativeInterface.hpp>
#include <audio/orchestra/api/Android.h> #include <audio/orchestra/api/Android.hpp>
/* include auto generated file */ /* include auto generated file */
#include <org_musicdsp_orchestra_OrchestraConstants.h> #include <org_musicdsp_orchestra_OrchestraConstants.hpp>
#include <jvm-basics/jvm-basics.h> #include <jvm-basics/jvm-basics.hpp>
#include <ememory/memory.h> #include <ememory/memory.hpp>
#include <ejson/ejson.h> #include <ejson/ejson.hpp>
class AndroidOrchestraContext { class AndroidOrchestraContext {
public: public:

View File

@ -7,12 +7,12 @@
#ifdef ORCHESTRA_BUILD_JAVA #ifdef ORCHESTRA_BUILD_JAVA
#include <audio/orchestra/DeviceInfo.h> #include <audio/orchestra/DeviceInfo.hpp>
#include <audio/orchestra/mode.h> #include <audio/orchestra/mode.hpp>
#include <audio/orchestra/error.h> #include <audio/orchestra/error.hpp>
#include <audio/orchestra/StreamOptions.h> #include <audio/orchestra/StreamOptions.hpp>
#include <audio/format.h> #include <audio/format.hpp>
#include <ememory/memory.h> #include <ememory/memory.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -8,8 +8,8 @@
#if defined(ORCHESTRA_BUILD_ASIO) #if defined(ORCHESTRA_BUILD_ASIO)
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Asio::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Asio::create() {
return ememory::SharedPtr<audio::orchestra::api::Asio>(new audio::orchestra::api::Asio()); return ememory::SharedPtr<audio::orchestra::api::Asio>(new audio::orchestra::api::Asio());

View File

@ -14,11 +14,11 @@
#if defined(__MACOSX_CORE__) || defined(ORCHESTRA_BUILD_MACOSX_CORE) #if defined(__MACOSX_CORE__) || defined(ORCHESTRA_BUILD_MACOSX_CORE)
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <thread> #include <thread>
#include <ethread/tools.h> #include <ethread/tools.hpp>
#include <audio/orchestra/api/Core.h> #include <audio/orchestra/api/Core.hpp>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Core::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Core::create() {
return ememory::SharedPtr<audio::orchestra::api::Core>(new audio::orchestra::api::Core()); return ememory::SharedPtr<audio::orchestra::api::Core>(new audio::orchestra::api::Core());

View File

@ -7,7 +7,7 @@
#pragma once #pragma once
#ifdef ORCHESTRA_BUILD_MACOSX_CORE #ifdef ORCHESTRA_BUILD_MACOSX_CORE
#include <CoreAudio/AudioHardware.h> #include <CoreAudio/AudioHardware.hpp>
namespace audio { namespace audio {

View File

@ -7,10 +7,10 @@
// Windows DirectSound API // Windows DirectSound API
#if defined(ORCHESTRA_BUILD_DS) #if defined(ORCHESTRA_BUILD_DS)
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <ethread/tools.h> #include <ethread/tools.hpp>
#include <audio/orchestra/api/Ds.h> #include <audio/orchestra/api/Ds.hpp>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Ds::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Ds::create() {
return ememory::SharedPtr<audio::orchestra::api::Ds>(new audio::orchestra::api::Ds()); return ememory::SharedPtr<audio::orchestra::api::Ds>(new audio::orchestra::api::Ds());

View File

@ -6,8 +6,8 @@
*/ */
#if defined(ORCHESTRA_BUILD_DUMMY) #if defined(ORCHESTRA_BUILD_DUMMY)
#include <audio/orchestra/api/Dummy.h> #include <audio/orchestra/api/Dummy.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Dummy::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Dummy::create() {
return ememory::SharedPtr<audio::orchestra::api::Dummy>(new audio::orchestra::api::Dummy()); return ememory::SharedPtr<audio::orchestra::api::Dummy>(new audio::orchestra::api::Dummy());

View File

@ -8,7 +8,7 @@
#ifdef ORCHESTRA_BUILD_DUMMY #ifdef ORCHESTRA_BUILD_DUMMY
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -10,11 +10,11 @@
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <iostream> #include <iostream>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <string.h> #include <string.h>
#include <ethread/tools.h> #include <ethread/tools.hpp>
#include <audio/orchestra/api/Jack.h> #include <audio/orchestra/api/Jack.hpp>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Jack::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Jack::create() {
return ememory::SharedPtr<audio::orchestra::api::Jack>(new audio::orchestra::api::Jack()); return ememory::SharedPtr<audio::orchestra::api::Jack>(new audio::orchestra::api::Jack());

View File

@ -10,14 +10,14 @@
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <pulse/error.h> #include <pulse/error.h>
#include <pulse/simple.h> #include <pulse/simple.h>
#include <cstdio> #include <cstdio>
#include <ethread/tools.h> #include <ethread/tools.hpp>
#include <audio/orchestra/api/PulseDeviceList.h> #include <audio/orchestra/api/PulseDeviceList.hpp>
#include <audio/orchestra/api/Pulse.h> #include <audio/orchestra/api/Pulse.hpp>
ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Pulse::create() { ememory::SharedPtr<audio::orchestra::Api> audio::orchestra::api::Pulse::create() {
return ememory::SharedPtr<audio::orchestra::api::Pulse>(new audio::orchestra::api::Pulse()); return ememory::SharedPtr<audio::orchestra::api::Pulse>(new audio::orchestra::api::Pulse());

View File

@ -9,13 +9,13 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <pulse/pulseaudio.h> #include <pulse/pulseaudio.hpp>
#include <audio/orchestra/api/PulseDeviceList.h> #include <audio/orchestra/api/PulseDeviceList.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <audio/Time.h> #include <audio/Time.hpp>
#include <audio/Duration.h> #include <audio/Duration.hpp>
#include <audio/format.h> #include <audio/format.hpp>
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
// This callback gets called when our context changes state. We really only // This callback gets called when our context changes state. We really only
// care about when it's ready or if it has failed // care about when it's ready or if it has failed

View File

@ -7,8 +7,8 @@
#pragma once #pragma once
#ifdef ORCHESTRA_BUILD_PULSE #ifdef ORCHESTRA_BUILD_PULSE
#include <etk/types.h> #include <etk/types.hpp>
#include <audio/orchestra/DeviceInfo.h> #include <audio/orchestra/DeviceInfo.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -1,25 +0,0 @@
/** @file
* @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file)
* @fork from RTAudio
*/
#pragma once
#include <thread>
#include <condition_variable>
#include <mutex>
#include <chrono>
#include <functional>
#include <ememory/memory.h>
#include <audio/channel.h>
#include <audio/format.h>
#include <audio/orchestra/error.h>
#include <audio/orchestra/status.h>
#include <audio/orchestra/Flags.h>
#include <audio/orchestra/CallbackInfo.h>
#include <audio/orchestra/DeviceInfo.h>
#include <audio/orchestra/StreamOptions.h>
#include <audio/orchestra/StreamParameters.h>

25
audio/orchestra/base.hpp Normal file
View File

@ -0,0 +1,25 @@
/** @file
* @author Edouard DUPIN
* @copyright 2011, Edouard DUPIN, all right reserved
* @license APACHE v2.0 (see license file)
* @fork from RTAudio
*/
#pragma once
#include <thread>
#include <condition_variable>
#include <mutex>
#include <chrono>
#include <functional>
#include <ememory/memory.hpp>
#include <audio/channel.hpp>
#include <audio/format.hpp>
#include <audio/orchestra/error.hpp>
#include <audio/orchestra/status.hpp>
#include <audio/orchestra/Flags.hpp>
#include <audio/orchestra/CallbackInfo.hpp>
#include <audio/orchestra/DeviceInfo.hpp>
#include <audio/orchestra/StreamOptions.hpp>
#include <audio/orchestra/StreamParameters.hpp>

View File

@ -5,7 +5,7 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
int32_t audio::orchestra::getLogId() { int32_t audio::orchestra::getLogId() {
static int32_t g_val = elog::registerInstance("audio-orchestra"); static int32_t g_val = elog::registerInstance("audio-orchestra");

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <elog/log.h> #include <elog/log.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,5 +5,5 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/error.h> #include <audio/orchestra/error.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,8 +5,8 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/mode.h> #include <audio/orchestra/mode.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
int32_t audio::orchestra::modeToIdTable(enum mode _mode) { int32_t audio::orchestra::modeToIdTable(enum mode _mode) {
switch (_mode) { switch (_mode) {

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,8 +5,8 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/status.h> #include <audio/orchestra/status.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
static const char* listValue[] = { static const char* listValue[] = {
"ok", "ok",
"overflow", "overflow",

View File

@ -6,7 +6,7 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -5,8 +5,8 @@
* @fork from RTAudio * @fork from RTAudio
*/ */
#include <audio/orchestra/type.h> #include <audio/orchestra/type.hpp>
#include <audio/orchestra/debug.h> #include <audio/orchestra/debug.hpp>
#include <iostream> #include <iostream>
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>

View File

@ -6,8 +6,8 @@
*/ */
#pragma once #pragma once
#include <etk/types.h> #include <etk/types.hpp>
#include <etk/stdTools.h> #include <etk/stdTools.hpp>
namespace audio { namespace audio {
namespace orchestra { namespace orchestra {

View File

@ -4,10 +4,10 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/etk.h> #include <etk/etk.hpp>
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <unistd.h> #include <unistd.h>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
int main(int _argc, const char **_argv) { int main(int _argc, const char **_argv) {
// the only one init for etk: // the only one init for etk:

View File

@ -4,10 +4,10 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/etk.h> #include <etk/etk.hpp>
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <unistd.h> #include <unistd.h>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
int main(int _argc, const char **_argv) { int main(int _argc, const char **_argv) {
// the only one init for etk: // the only one init for etk:

View File

@ -4,10 +4,10 @@
* @license APACHE v2.0 (see license file) * @license APACHE v2.0 (see license file)
*/ */
#include <etk/etk.h> #include <etk/etk.hpp>
#include <test-debug/debug.h> #include <test-debug/debug.hpp>
#include <unistd.h> #include <unistd.h>
#include <audio/orchestra/Interface.h> #include <audio/orchestra/Interface.hpp>
int main(int _argc, const char **_argv) { int main(int _argc, const char **_argv) {
// the only one init for etk: // the only one init for etk: