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

[DEV] update next lutin version and debug android play audio

Browse Source
This commit is contained in:
Edouard DUPIN
2015-09-24 21:44:04 +02:00
parent 71fc8af983
commit 2b665e9383
6 changed files with 50 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
audio/orchestra/Interface.cpp
View File

@@ -133,6 +133,8 @@ enum audio::orchestra::error audio::orchestra::Interface::instanciate(const std:
if (m_api->getDeviceCount() != 0) {
ATA_INFO(" ==> api open");
break;
} else {
ATA_INFO(" ==> Interface exist, but have no devices: " << m_api->getDeviceCount());
}
}
if (m_api != nullptr) {

7
audio/orchestra/api/AndroidNativeInterface.cpp
View File

@@ -210,7 +210,7 @@ class AndroidOrchestraContext {
uint32_t getDeviceCount() {
// Request the clipBoard :
ATA_DEBUG("C->java : audio get device count");
ATA_WARNING("C->java : audio get device count");
int status;
if(!java_attach_current_thread(&status)) {
return 0;
@@ -221,13 +221,13 @@ class AndroidOrchestraContext {
// manage execption :
jvm_basics::checkExceptionJavaVM(m_JavaVirtualMachinePointer);
java_detach_current_thread(status);
ATA_WARNING(" find " << (uint32_t)ret << " IO");
return (uint32_t)ret;
return 0;
}
audio::orchestra::DeviceInfo getDeviceInfo(uint32_t _idDevice) {
audio::orchestra::DeviceInfo info;
// Request the clipBoard :
ATA_DEBUG("C->java : audio get device count");
ATA_WARNING("C->java : audio get device info " << _idDevice);
int status;
if(!java_attach_current_thread(&status)) {
return info;
@@ -401,6 +401,7 @@ static int32_t s_nbContextRequested(0);
uint32_t audio::orchestra::api::android::getDeviceCount() {
if (s_localContext == nullptr) {
ATA_ERROR("Have no Orchertra API instanciate in JAVA ...");
return 0;
}
return s_localContext->getDeviceCount();

64
lutin_audio-orchestra.py
View File

@@ -8,9 +8,9 @@ def get_desc():
def create(target):
myModule = module.Module(__file__, 'audio-orchestra', 'LIBRARY')
my_module = module.Module(__file__, 'audio-orchestra', 'LIBRARY')
myModule.add_src_file([
my_module.add_src_file([
'audio/orchestra/debug.cpp',
'audio/orchestra/status.cpp',
'audio/orchestra/type.cpp',
@@ -25,7 +25,7 @@ def create(target):
'audio/orchestra/StreamOptions.cpp',
'audio/orchestra/api/Dummy.cpp'
])
myModule.add_header_file([
my_module.add_header_file([
'audio/orchestra/debug.h',
'audio/orchestra/status.h',
'audio/orchestra/type.h',
@@ -41,64 +41,64 @@ def create(target):
'audio/orchestra/CallbackInfo.h',
'audio/orchestra/StreamParameters.h'
])
myModule.add_module_depend(['audio', 'etk'])
my_module.add_module_depend(['audio', 'etk'])
# add all the time the dummy interface
myModule.add_export_flag('c++', ['-DORCHESTRA_BUILD_DUMMY'])
my_module.add_export_flag('c++', ['-DORCHESTRA_BUILD_DUMMY'])
# TODO : Add a FILE interface:
if target.name=="Windows":
myModule.add_src_file([
my_module.add_src_file([
'audio/orchestra/api/Asio.cpp',
'audio/orchestra/api/Ds.cpp',
])
# load optionnal API:
myModule.add_optionnal_module_depend('asio', ["c++", "-DORCHESTRA_BUILD_ASIO"])
myModule.add_optionnal_module_depend('ds', ["c++", "-DORCHESTRA_BUILD_DS"])
myModule.add_optionnal_module_depend('wasapi', ["c++", "-DORCHESTRA_BUILD_WASAPI"])
my_module.add_optionnal_module_depend('asio', ["c++", "-DORCHESTRA_BUILD_ASIO"])
my_module.add_optionnal_module_depend('ds', ["c++", "-DORCHESTRA_BUILD_DS"])
my_module.add_optionnal_module_depend('wasapi', ["c++", "-DORCHESTRA_BUILD_WASAPI"])
elif target.name=="Linux":
myModule.add_src_file([
my_module.add_src_file([
'audio/orchestra/api/Alsa.cpp',
'audio/orchestra/api/Jack.cpp',
'audio/orchestra/api/Pulse.cpp',
'audio/orchestra/api/PulseDeviceList.cpp'
])
myModule.add_optionnal_module_depend('alsa', ["c++", "-DORCHESTRA_BUILD_ALSA"])
myModule.add_optionnal_module_depend('jack', ["c++", "-DORCHESTRA_BUILD_JACK"])
myModule.add_optionnal_module_depend('pulse', ["c++", "-DORCHESTRA_BUILD_PULSE"])
my_module.add_optionnal_module_depend('alsa', ["c++", "-DORCHESTRA_BUILD_ALSA"])
my_module.add_optionnal_module_depend('jack', ["c++", "-DORCHESTRA_BUILD_JACK"])
my_module.add_optionnal_module_depend('pulse', ["c++", "-DORCHESTRA_BUILD_PULSE"])
elif target.name=="MacOs":
myModule.add_src_file([
my_module.add_src_file([
'audio/orchestra/api/Core.cpp',
'audio/orchestra/api/Oss.cpp'
])
# MacOsX core
myModule.add_optionnal_module_depend('CoreAudio', ["c++", "-DORCHESTRA_BUILD_MACOSX_CORE"])
my_module.add_optionnal_module_depend('CoreAudio', ["c++", "-DORCHESTRA_BUILD_MACOSX_CORE"])
elif target.name=="IOs":
myModule.add_src_file('audio/orchestra/api/CoreIos.mm')
my_module.add_src_file('audio/orchestra/api/CoreIos.mm')
# IOsX core
myModule.add_optionnal_module_depend('CoreAudio', ["c++", "-DORCHESTRA_BUILD_IOS_CORE"])
my_module.add_optionnal_module_depend('CoreAudio', ["c++", "-DORCHESTRA_BUILD_IOS_CORE"])
elif target.name=="Android":
myModule.add_src_file('android/org/musicdsp/orchestra/OrchestraConstants.java')
myModule.add_src_file('android/org/musicdsp/orchestra/OrchestraManagerCallback.java')
myModule.add_src_file('android/org/musicdsp/orchestra/OrchestraNative.java')
myModule.add_src_file('android/org/musicdsp/orchestra/OrchestraInterfaceInput.java')
myModule.add_src_file('android/org/musicdsp/orchestra/OrchestraInterfaceOutput.java')
myModule.add_src_file('android/org/musicdsp/orchestra/OrchestraManager.java')
my_module.add_src_file('android/org/musicdsp/orchestra/OrchestraConstants.java')
my_module.add_src_file('android/org/musicdsp/orchestra/OrchestraManagerCallback.java')
my_module.add_src_file('android/org/musicdsp/orchestra/OrchestraNative.java')
my_module.add_src_file('android/org/musicdsp/orchestra/OrchestraInterfaceInput.java')
my_module.add_src_file('android/org/musicdsp/orchestra/OrchestraInterfaceOutput.java')
my_module.add_src_file('android/org/musicdsp/orchestra/OrchestraManager.java')
# create inter language interface
myModule.add_src_file('org.musicdsp.orchestra.OrchestraConstants.javah')
myModule.add_path(tools.get_current_path(__file__) + '/android/', type='java')
myModule.add_module_depend(['SDK', 'jvm-basics', 'ejson'])
myModule.add_export_flag('c++', ['-DORCHESTRA_BUILD_JAVA'])
my_module.add_src_file('org.musicdsp.orchestra.OrchestraConstants.javah')
my_module.add_path(tools.get_current_path(__file__) + '/android/', type='java')
my_module.add_module_depend(['SDK', 'jvm-basics', 'ejson'])
my_module.add_export_flag('c++', ['-DORCHESTRA_BUILD_JAVA'])
myModule.add_src_file('audio/orchestra/api/Android.cpp')
myModule.add_src_file('audio/orchestra/api/AndroidNativeInterface.cpp')
my_module.add_src_file('audio/orchestra/api/Android.cpp')
my_module.add_src_file('audio/orchestra/api/AndroidNativeInterface.cpp')
# add tre creator of the basic java class ...
target.add_action("PACKAGE", 11, "audio-orchestra-out-wrapper", tool_generate_add_java_section_in_class)
target.add_action("BINARY", 11, "audio-orchestra-out-wrapper", tool_generate_add_java_section_in_class)
else:
debug.warning("unknow target for audio_orchestra : " + target.name);
myModule.add_path(tools.get_current_path(__file__))
my_module.add_path(tools.get_current_path(__file__))
return myModule
return my_module

8
tools/lutin_orchestra-in.py
View File

@@ -8,12 +8,12 @@ def get_desc():
def create(target):
myModule = module.Module(__file__, 'orchestra-in', 'BINARY')
my_module = module.Module(__file__, 'orchestra-in', 'BINARY')
myModule.add_src_file([
my_module.add_src_file([
'orchestra-in.cpp'
])
myModule.add_module_depend(['audio-orchestra', 'test-debug'])
return myModule
my_module.add_module_depend(['audio-orchestra', 'test-debug'])
return my_module

8
tools/lutin_orchestra-list.py
View File

@@ -8,12 +8,12 @@ def get_desc():
def create(target):
myModule = module.Module(__file__, 'orchestra-list', 'BINARY')
my_module = module.Module(__file__, 'orchestra-list', 'BINARY')
myModule.add_src_file([
my_module.add_src_file([
'orchestra-list.cpp'
])
myModule.add_module_depend(['audio-orchestra', 'test-debug'])
return myModule
my_module.add_module_depend(['audio-orchestra', 'test-debug'])
return my_module

8
tools/lutin_orchestra-out.py
View File

@@ -8,12 +8,12 @@ def get_desc():
def create(target):
myModule = module.Module(__file__, 'orchestra-out', 'BINARY')
my_module = module.Module(__file__, 'orchestra-out', 'BINARY')
myModule.add_src_file([
my_module.add_src_file([
'orchestra-out.cpp'
])
myModule.add_module_depend(['audio-orchestra', 'test-debug'])
return myModule
my_module.add_module_depend(['audio-orchestra', 'test-debug'])
return my_module