You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-15 13:51:40 +00:00
Bring that Whole New World to the Old Continent too
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
@@ -32,34 +32,32 @@
|
||||
#include "thread_jandroid.h"
|
||||
#ifndef ANDROID_NATIVE_ACTIVITY
|
||||
|
||||
AudioDriverAndroid* AudioDriverAndroid::s_ad=NULL;
|
||||
AudioDriverAndroid *AudioDriverAndroid::s_ad = NULL;
|
||||
|
||||
jobject AudioDriverAndroid::io;
|
||||
jmethodID AudioDriverAndroid::_init_audio;
|
||||
jmethodID AudioDriverAndroid::_write_buffer;
|
||||
jmethodID AudioDriverAndroid::_quit;
|
||||
jmethodID AudioDriverAndroid::_pause;
|
||||
bool AudioDriverAndroid::active=false;
|
||||
bool AudioDriverAndroid::active = false;
|
||||
jclass AudioDriverAndroid::cls;
|
||||
int AudioDriverAndroid::audioBufferFrames=0;
|
||||
int AudioDriverAndroid::mix_rate=44100;
|
||||
bool AudioDriverAndroid::quit=false;
|
||||
int AudioDriverAndroid::audioBufferFrames = 0;
|
||||
int AudioDriverAndroid::mix_rate = 44100;
|
||||
bool AudioDriverAndroid::quit = false;
|
||||
jobject AudioDriverAndroid::audioBuffer = NULL;
|
||||
void* AudioDriverAndroid::audioBufferPinned = NULL;
|
||||
Mutex *AudioDriverAndroid::mutex=NULL;
|
||||
int32_t* AudioDriverAndroid::audioBuffer32=NULL;
|
||||
void *AudioDriverAndroid::audioBufferPinned = NULL;
|
||||
Mutex *AudioDriverAndroid::mutex = NULL;
|
||||
int32_t *AudioDriverAndroid::audioBuffer32 = NULL;
|
||||
|
||||
|
||||
const char* AudioDriverAndroid::get_name() const {
|
||||
const char *AudioDriverAndroid::get_name() const {
|
||||
|
||||
return "Android";
|
||||
}
|
||||
|
||||
|
||||
Error AudioDriverAndroid::init(){
|
||||
Error AudioDriverAndroid::init() {
|
||||
|
||||
mutex = Mutex::create();
|
||||
/*
|
||||
/*
|
||||
// TODO: pass in/return a (Java) device ID, also whether we're opening for input or output
|
||||
this->spec.samples = Android_JNI_OpenAudioDevice(this->spec.freq, this->spec.format == AUDIO_U8 ? 0 : 1, this->spec.channels, this->spec.samples);
|
||||
SDL_CalculateAudioSpec(&this->spec);
|
||||
@@ -71,78 +69,70 @@ Error AudioDriverAndroid::init(){
|
||||
}
|
||||
*/
|
||||
|
||||
// Android_JNI_SetupThread();
|
||||
|
||||
|
||||
// __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device");
|
||||
// Android_JNI_SetupThread();
|
||||
|
||||
// __android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device");
|
||||
|
||||
JNIEnv *env = ThreadAndroid::get_env();
|
||||
int mix_rate = GLOBAL_DEF("audio/mix_rate",44100);
|
||||
int mix_rate = GLOBAL_DEF("audio/mix_rate", 44100);
|
||||
|
||||
int latency = GLOBAL_DEF("audio/output_latency",25);
|
||||
latency=50;
|
||||
unsigned int buffer_size = nearest_power_of_2( latency * mix_rate / 1000 );
|
||||
int latency = GLOBAL_DEF("audio/output_latency", 25);
|
||||
latency = 50;
|
||||
unsigned int buffer_size = nearest_power_of_2(latency * mix_rate / 1000);
|
||||
if (OS::get_singleton()->is_stdout_verbose()) {
|
||||
print_line("audio buffer size: "+itos(buffer_size));
|
||||
print_line("audio buffer size: " + itos(buffer_size));
|
||||
}
|
||||
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","Initializing audio! params: %i,%i ",mix_rate,buffer_size);
|
||||
audioBuffer = env->CallObjectMethod(io,_init_audio, mix_rate, buffer_size);
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "Initializing audio! params: %i,%i ", mix_rate, buffer_size);
|
||||
audioBuffer = env->CallObjectMethod(io, _init_audio, mix_rate, buffer_size);
|
||||
|
||||
|
||||
ERR_FAIL_COND_V( audioBuffer == NULL, ERR_INVALID_PARAMETER);
|
||||
ERR_FAIL_COND_V(audioBuffer == NULL, ERR_INVALID_PARAMETER);
|
||||
|
||||
audioBuffer = env->NewGlobalRef(audioBuffer);
|
||||
|
||||
jboolean isCopy = JNI_FALSE;
|
||||
audioBufferPinned = env->GetShortArrayElements((jshortArray)audioBuffer, &isCopy);
|
||||
audioBufferFrames = env->GetArrayLength((jshortArray)audioBuffer);
|
||||
audioBuffer32 = memnew_arr(int32_t,audioBufferFrames);
|
||||
audioBuffer32 = memnew_arr(int32_t, audioBufferFrames);
|
||||
|
||||
return OK;
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::start(){
|
||||
active=true;
|
||||
|
||||
void AudioDriverAndroid::start() {
|
||||
active = true;
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::setup( jobject p_io) {
|
||||
void AudioDriverAndroid::setup(jobject p_io) {
|
||||
|
||||
JNIEnv *env = ThreadAndroid::get_env();
|
||||
io=p_io;
|
||||
io = p_io;
|
||||
|
||||
jclass c = env->GetObjectClass(io);
|
||||
cls = (jclass)env->NewGlobalRef(c);
|
||||
|
||||
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","starting to attempt get methods");
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "starting to attempt get methods");
|
||||
|
||||
_init_audio = env->GetMethodID(cls, "audioInit", "(II)Ljava/lang/Object;");
|
||||
if(_init_audio != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","*******GOT METHOD _init_audio ok!!");
|
||||
if (_init_audio != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "*******GOT METHOD _init_audio ok!!");
|
||||
} else {
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","audioinit ok!");
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "audioinit ok!");
|
||||
}
|
||||
|
||||
_write_buffer = env->GetMethodID(cls, "audioWriteShortBuffer", "([S)V");
|
||||
if(_write_buffer != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","*******GOT METHOD _write_buffer ok!!");
|
||||
if (_write_buffer != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "*******GOT METHOD _write_buffer ok!!");
|
||||
}
|
||||
|
||||
|
||||
_quit = env->GetMethodID(cls, "audioQuit", "()V");
|
||||
if(_quit != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","*******GOT METHOD _quit ok!!");
|
||||
if (_quit != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "*******GOT METHOD _quit ok!!");
|
||||
}
|
||||
|
||||
_pause = env->GetMethodID(cls, "audioPause", "(Z)V");
|
||||
if(_quit != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","*******GOT METHOD _pause ok!!");
|
||||
if (_quit != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "*******GOT METHOD _pause ok!!");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::thread_func(JNIEnv *env) {
|
||||
@@ -150,48 +140,44 @@ void AudioDriverAndroid::thread_func(JNIEnv *env) {
|
||||
jclass cls = env->FindClass("org/godotengine/godot/Godot");
|
||||
if (cls) {
|
||||
|
||||
cls=(jclass)env->NewGlobalRef(cls);
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","*******CLASS FOUND!!!");
|
||||
cls = (jclass)env->NewGlobalRef(cls);
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "*******CLASS FOUND!!!");
|
||||
}
|
||||
jfieldID fid = env->GetStaticFieldID(cls, "io", "Lorg/godotengine/godot/GodotIO;");
|
||||
jobject ob = env->GetStaticObjectField(cls,fid);
|
||||
jobject ob = env->GetStaticObjectField(cls, fid);
|
||||
jobject gob = env->NewGlobalRef(ob);
|
||||
jclass c = env->GetObjectClass(gob);
|
||||
jclass lcls = (jclass)env->NewGlobalRef(c);
|
||||
_write_buffer = env->GetMethodID(lcls, "audioWriteShortBuffer", "([S)V");
|
||||
if(_write_buffer != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO,"godot","*******GOT METHOD _write_buffer ok!!");
|
||||
if (_write_buffer != 0) {
|
||||
__android_log_print(ANDROID_LOG_INFO, "godot", "*******GOT METHOD _write_buffer ok!!");
|
||||
}
|
||||
|
||||
while(!quit) {
|
||||
while (!quit) {
|
||||
|
||||
|
||||
int16_t* ptr = (int16_t*)audioBufferPinned;
|
||||
int16_t *ptr = (int16_t *)audioBufferPinned;
|
||||
int fc = audioBufferFrames;
|
||||
|
||||
if (!s_ad->active || mutex->try_lock()!=OK) {
|
||||
if (!s_ad->active || mutex->try_lock() != OK) {
|
||||
|
||||
for(int i=0;i<fc;i++) {
|
||||
ptr[i]=0;
|
||||
for (int i = 0; i < fc; i++) {
|
||||
ptr[i] = 0;
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
|
||||
s_ad->audio_server_process(fc/2,audioBuffer32);
|
||||
s_ad->audio_server_process(fc / 2, audioBuffer32);
|
||||
|
||||
mutex->unlock();
|
||||
|
||||
for(int i=0;i<fc;i++) {
|
||||
for (int i = 0; i < fc; i++) {
|
||||
|
||||
ptr[i]=audioBuffer32[i]>>16;
|
||||
ptr[i] = audioBuffer32[i] >> 16;
|
||||
}
|
||||
|
||||
}
|
||||
env->ReleaseShortArrayElements((jshortArray)audioBuffer, (jshort *)ptr, JNI_COMMIT);
|
||||
env->CallVoidMethod(gob, _write_buffer, (jshortArray)audioBuffer);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
int AudioDriverAndroid::get_mix_rate() const {
|
||||
@@ -199,16 +185,15 @@ int AudioDriverAndroid::get_mix_rate() const {
|
||||
return mix_rate;
|
||||
}
|
||||
|
||||
AudioDriverSW::OutputFormat AudioDriverAndroid::get_output_format() const{
|
||||
AudioDriverSW::OutputFormat AudioDriverAndroid::get_output_format() const {
|
||||
|
||||
return OUTPUT_STEREO;
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::lock(){
|
||||
void AudioDriverAndroid::lock() {
|
||||
|
||||
if (mutex)
|
||||
mutex->lock();
|
||||
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::unlock() {
|
||||
@@ -217,7 +202,7 @@ void AudioDriverAndroid::unlock() {
|
||||
mutex->unlock();
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::finish(){
|
||||
void AudioDriverAndroid::finish() {
|
||||
|
||||
JNIEnv *env = ThreadAndroid::get_env();
|
||||
env->CallVoidMethod(io, _quit);
|
||||
@@ -228,21 +213,19 @@ void AudioDriverAndroid::finish(){
|
||||
audioBufferPinned = NULL;
|
||||
}
|
||||
|
||||
active=false;
|
||||
active = false;
|
||||
}
|
||||
|
||||
void AudioDriverAndroid::set_pause(bool p_pause) {
|
||||
|
||||
JNIEnv *env = ThreadAndroid::get_env();
|
||||
env->CallVoidMethod(io, _pause,p_pause);
|
||||
|
||||
env->CallVoidMethod(io, _pause, p_pause);
|
||||
}
|
||||
|
||||
AudioDriverAndroid::AudioDriverAndroid() {
|
||||
|
||||
s_ad=this;
|
||||
active=false;
|
||||
|
||||
s_ad = this;
|
||||
active = false;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user