diff --git a/lutin_river.py b/lutin_river.py index b04455d..96bac4b 100644 --- a/lutin_river.py +++ b/lutin_river.py @@ -21,16 +21,8 @@ def create(target): 'river/io/NodeAEC.cpp', 'river/io/Manager.cpp' ]) - if False: - myModule.add_optionnal_module_depend('airtaudio', "__AIRTAUDIO_INFERFACE__") - myModule.add_optionnal_module_depend('portaudio', "__PORTAUDIO_INFERFACE__") - else: - myModule.compile_flags_CC([ - '-D__AIRTAUDIO_INFERFACE__', - '-D__PORTAUDIO_INFERFACE__' - ]) - myModule.add_module_depend(['airtaudio', 'portaudio']) - + myModule.add_optionnal_module_depend('airtaudio', "__AIRTAUDIO_INFERFACE__") + myModule.add_optionnal_module_depend('portaudio', "__PORTAUDIO_INFERFACE__") myModule.add_module_depend(['audio', 'drain', 'ejson']) myModule.add_export_path(tools.get_current_path(__file__)) diff --git a/river/io/Manager.cpp b/river/io/Manager.cpp index 4c87b39..1f3bae7 100644 --- a/river/io/Manager.cpp +++ b/river/io/Manager.cpp @@ -99,17 +99,23 @@ std::shared_ptr river::io::Manager::getNode(const std::string& if (tmpObject != nullptr) { // get type : io std::string ioType = tmpObject->getStringValue("io", "error"); + #ifdef __AIRTAUDIO_INFERFACE__ if ( ioType == "input" || ioType == "output") { std::shared_ptr tmp = river::io::NodeAirTAudio::create(_name, tmpObject); m_list.push_back(tmp); return tmp; - } else if ( ioType == "PAinput" - || ioType == "PAoutput") { + } else + #endif + #ifdef __PORTAUDIO_INFERFACE__ + if ( ioType == "PAinput" + || ioType == "PAoutput") { std::shared_ptr tmp = river::io::NodePortAudio::create(_name, tmpObject); m_list.push_back(tmp); return tmp; - } else if (ioType == "aec") { + } else + #endif + if (ioType == "aec") { std::shared_ptr tmp = river::io::NodeAEC::create(_name, tmpObject); m_list.push_back(tmp); return tmp; diff --git a/river/io/NodeAirTAudio.cpp b/river/io/NodeAirTAudio.cpp index c610ff6..5b80764 100644 --- a/river/io/NodeAirTAudio.cpp +++ b/river/io/NodeAirTAudio.cpp @@ -4,6 +4,8 @@ * @license APACHE v2.0 (see license file) */ +#ifdef __AIRTAUDIO_INFERFACE__ + #include #include @@ -261,3 +263,5 @@ void river::io::NodeAirTAudio::stop() { RIVER_ERROR("Stop stream : '" << m_name << "' mode=" << (m_isInput?"input":"output") << " can not stop stream ... " << err); } } + +#endif diff --git a/river/io/NodeAirTAudio.h b/river/io/NodeAirTAudio.h index 66b86c2..cb7a491 100644 --- a/river/io/NodeAirTAudio.h +++ b/river/io/NodeAirTAudio.h @@ -7,6 +7,8 @@ #ifndef __RIVER_IO_NODE_AIRTAUDIO_H__ #define __RIVER_IO_NODE_AIRTAUDIO_H__ +#ifdef __AIRTAUDIO_INFERFACE__ + #include namespace river { @@ -49,6 +51,7 @@ namespace river { }; } } +#endif #endif diff --git a/river/io/NodePortAudio.cpp b/river/io/NodePortAudio.cpp index 5ce779c..e06e801 100644 --- a/river/io/NodePortAudio.cpp +++ b/river/io/NodePortAudio.cpp @@ -4,6 +4,8 @@ * @license APACHE v2.0 (see license file) */ +#ifdef __PORTTAUDIO_INFERFACE__ + #include #include @@ -150,3 +152,5 @@ void river::io::NodePortAudio::stop() { RIVER_ERROR("Start stream : '" << m_name << "' mode=" << (m_isInput?"input":"output") << " can not stop stream ... " << Pa_GetErrorText(err)); } } +#endif + diff --git a/river/io/NodePortAudio.h b/river/io/NodePortAudio.h index 3525581..031b27b 100644 --- a/river/io/NodePortAudio.h +++ b/river/io/NodePortAudio.h @@ -7,6 +7,8 @@ #ifndef __RIVER_IO_NODE_PORTAUDIO_H__ #define __RIVER_IO_NODE_PORTAUDIO_H__ +#ifdef __PORTTAUDIO_INFERFACE__ + #include #include #include @@ -41,6 +43,7 @@ namespace river { }; } } +#endif #endif