godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'libao'

This commit is contained in:
Anton Yabchinskiy 2014-11-22 17:55:22 +03:00
parent e696dba522 298f6be9bf
commit 6bfdfa041a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ao/audio_driver_ao.cpp
View File

@ -31,6 +31,8 @@
#include "globals.h" #include "globals.h"
#include "os/os.h" #include "os/os.h"
#include <cstring>
Error AudioDriverAO::init() { Error AudioDriverAO::init() {
active = false; active = false;
@ -68,7 +70,8 @@ Error AudioDriverAO::init() {
void AudioDriverAO::thread_func(void* p_udata) { void AudioDriverAO::thread_func(void* p_udata) {
AudioDriverAO* ad = (AudioDriverAO*)p_udata; AudioDriverAO* ad = (AudioDriverAO*)p_udata;
int16_t* samples_out = samples_in; // Overwrite samples on conversion // Overwrite samples on conversion
int16_t* samples_out = reinterpret_cast<int16_t*>(ad->samples_in);
unsigned int n_samples = ad->buffer_size * ad->channels; unsigned int n_samples = ad->buffer_size * ad->channels;
unsigned int n_bytes = n_samples * sizeof(int16_t); unsigned int n_bytes = n_samples * sizeof(int16_t);
@ -88,7 +91,7 @@ void AudioDriverAO::thread_func(void* p_udata) {
if (ad->exit_thread) if (ad->exit_thread)
break; break;
if (!ao_play(ad->device, reinterpret_cast<char*>(samples_out), n_bytes) { if (!ao_play(ad->device, reinterpret_cast<char*>(samples_out), n_bytes)) {
ERR_PRINT("ao_play() failed"); ERR_PRINT("ao_play() failed");
} }
}; };