godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Bring that Whole New World to the Old Continent too

Browse Source 
Applies the clang-format style to the 2.1 branch as done for master in
5dbf1809c6.
This commit is contained in:
Rémi Verschelde
2017-03-19 00:36:26 +01:00
parent 1d418afe86
commit f8db8a3faa
1308 changed files with 147754 additions and 174357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
platform/android/audio_driver_opensl.h
View File

@@ -29,13 +29,10 @@
#ifndef AUDIO_DRIVER_OPENSL_H
#define AUDIO_DRIVER_OPENSL_H
#include "servers/audio/audio_server_sw.h"
#include "os/mutex.h"
#include <SLES/OpenSLES.h>
#include "SLES/OpenSLES_Android.h"
#include "os/mutex.h"
#include "servers/audio/audio_server_sw.h"
#include <SLES/OpenSLES.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