From e60c41be9fa6c3123fb089431d46cd08f3c2a714 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 17:49:51 +0300 Subject: Fix syntax error in call to ao_play() --- drivers/ao/audio_driver_ao.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 3c4aa454e7..d9f12ad92f 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -88,7 +88,7 @@ void AudioDriverAO::thread_func(void* p_udata) { if (ad->exit_thread) break; - if (!ao_play(ad->device, reinterpret_cast(samples_out), n_bytes) { + if (!ao_play(ad->device, reinterpret_cast(samples_out), n_bytes)) { ERR_PRINT("ao_play() failed"); } }; -- cgit v1.2.3 From 4a3e24073247d39981fe1984e9a02bb766f35a55 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 17:52:00 +0300 Subject: samples_in is an instance variable, prefix it with ad-> --- drivers/ao/audio_driver_ao.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index d9f12ad92f..1b9847c829 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -68,7 +68,7 @@ Error AudioDriverAO::init() { void AudioDriverAO::thread_func(void* p_udata) { AudioDriverAO* ad = (AudioDriverAO*)p_udata; - int16_t* samples_out = samples_in; // Overwrite samples on conversion + int16_t* samples_out = ad->samples_in; // Overwrite samples on conversion unsigned int n_samples = ad->buffer_size * ad->channels; unsigned int n_bytes = n_samples * sizeof(int16_t); -- cgit v1.2.3 From 29be6da54a54448539486a367305018ee7330801 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 17:54:00 +0300 Subject: Cast samples_in to samples_out with reinterpret_cast --- drivers/ao/audio_driver_ao.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 1b9847c829..9acc22febe 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -68,7 +68,8 @@ Error AudioDriverAO::init() { void AudioDriverAO::thread_func(void* p_udata) { AudioDriverAO* ad = (AudioDriverAO*)p_udata; - int16_t* samples_out = ad->samples_in; // Overwrite samples on conversion + // Overwrite samples on conversion + int16_t* samples_out = reinterpret_cast(ad->samples_in); unsigned int n_samples = ad->buffer_size * ad->channels; unsigned int n_bytes = n_samples * sizeof(int16_t); -- cgit v1.2.3 From 298f6be9bf47e5948f2242747cce4214143d1432 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Sat, 22 Nov 2014 17:54:41 +0300 Subject: Include cstring header for memset() --- drivers/ao/audio_driver_ao.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 9acc22febe..b42e3af6bb 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -31,6 +31,8 @@ #include "globals.h" #include "os/os.h" +#include + Error AudioDriverAO::init() { active = false; -- cgit v1.2.3