diff options
| author | Rémi Verschelde | 2016-07-21 17:31:14 +0200 |
|---|---|---|
| committer | GitHub | 2016-07-21 17:31:14 +0200 |
| commit | 93de25f68a6b277293c0d3476996ab074ba3dc16 (patch) | |
| tree | 54a0373eb925fab10751a662744daa08aadb2229 /platform/android/audio_driver_jandroid.cpp | |
| parent | 2c1a74fb3a8aac2d8d8a7050b890aa780a5f0356 (diff) | |
| parent | beaa56bff209d4a4a24e556ff4b592f380c99550 (diff) | |
| download | godot-93de25f68a6b277293c0d3476996ab074ba3dc16.tar.gz godot-93de25f68a6b277293c0d3476996ab074ba3dc16.tar.zst godot-93de25f68a6b277293c0d3476996ab074ba3dc16.zip | |
Merge pull request #5837 from hurikhan/android_cleanup
Minor code formatting in platform/android
Diffstat (limited to 'platform/android/audio_driver_jandroid.cpp')
| -rw-r--r-- | platform/android/audio_driver_jandroid.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp index 6d428e3fe..419ed977b 100644 --- a/platform/android/audio_driver_jandroid.cpp +++ b/platform/android/audio_driver_jandroid.cpp @@ -192,29 +192,31 @@ void AudioDriverAndroid::thread_func(JNIEnv *env) { env->CallVoidMethod(gob, _write_buffer, (jshortArray)audioBuffer); } - - } int AudioDriverAndroid::get_mix_rate() const { return mix_rate; } + AudioDriverSW::OutputFormat AudioDriverAndroid::get_output_format() const{ return OUTPUT_STEREO; } + void AudioDriverAndroid::lock(){ if (mutex) mutex->lock(); } + void AudioDriverAndroid::unlock() { if (mutex) mutex->unlock(); } + void AudioDriverAndroid::finish(){ JNIEnv *env = ThreadAndroid::get_env(); @@ -236,13 +238,11 @@ void AudioDriverAndroid::set_pause(bool p_pause) { } -AudioDriverAndroid::AudioDriverAndroid() -{ +AudioDriverAndroid::AudioDriverAndroid() { + s_ad=this; active=false; - - } #endif |
