diff options
Diffstat (limited to '')
| -rw-r--r-- | platform/android/audio_driver_opensl.h | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/platform/android/audio_driver_opensl.h b/platform/android/audio_driver_opensl.h index 8839d20ba..a27277a1c 100644 --- a/platform/android/audio_driver_opensl.h +++ b/platform/android/audio_driver_opensl.h @@ -29,13 +29,10 @@ #ifndef AUDIO_DRIVER_OPENSL_H #define AUDIO_DRIVER_OPENSL_H - - -#include "servers/audio/audio_server_sw.h" +#include "SLES/OpenSLES_Android.h" #include "os/mutex.h" +#include "servers/audio/audio_server_sw.h" #include <SLES/OpenSLES.h> -#include "SLES/OpenSLES_Android.h" - class AudioDriverOpenSL : public AudioDriverSW { @@ -44,18 +41,16 @@ class AudioDriverOpenSL : public AudioDriverSW { enum { - BUFFER_COUNT=2 + BUFFER_COUNT = 2 }; bool pause; - uint32_t buffer_size; int16_t *buffers[BUFFER_COUNT]; int32_t *mixdown_buffer; int last_free; - SLPlayItf playItf; SLObjectItf sl; SLEngineItf EngineItf; @@ -69,31 +64,31 @@ class AudioDriverOpenSL : public AudioDriverSW { SLDataLocator_OutputMix locator_outputmix; SLBufferQueueState state; - static AudioDriverOpenSL* s_ad; + static AudioDriverOpenSL *s_ad; void _buffer_callback( - SLAndroidSimpleBufferQueueItf queueItf - /* SLuint32 eventFlags, + SLAndroidSimpleBufferQueueItf queueItf + /* SLuint32 eventFlags, const void * pBuffer, SLuint32 bufferSize, SLuint32 dataUsed*/); static void _buffer_callbacks( - SLAndroidSimpleBufferQueueItf queueItf, - /*SLuint32 eventFlags, + SLAndroidSimpleBufferQueueItf queueItf, + /*SLuint32 eventFlags, const void * pBuffer, SLuint32 bufferSize, SLuint32 dataUsed,*/ - void *pContext); -public: + void *pContext); +public: void set_singleton(); - virtual const char* get_name() const; + virtual const char *get_name() const; virtual Error init(); virtual void start(); - virtual int get_mix_rate() const ; + virtual int get_mix_rate() const; virtual OutputFormat get_output_format() const; virtual void lock(); virtual void unlock(); @@ -105,4 +100,3 @@ public: }; #endif // AUDIO_DRIVER_ANDROID_H - |