Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-09-30 12:16:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

File style cleanup for the SDL 2.0 release

Browse Source
This commit is contained in:
Sam Lantinga
2013-05-18 14:17:52 -07:00
parent 3beb70c4bc
commit 0d9b661db8
376 changed files with 17562 additions and 17773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/audio/android/SDL_androidaudio.c
View File

@@ -40,12 +40,12 @@ AndroidAUD_OpenDevice(_THIS, const char *devname, int iscapture)
SDL_AudioFormat test_format;
if (iscapture) {
//TODO: implement capture
return SDL_SetError("Capture not supported on Android");
/* TODO: implement capture */
return SDL_SetError("Capture not supported on Android");
}
if (audioDevice != NULL) {
return SDL_SetError("Only one audio device at a time please!");
return SDL_SetError("Only one audio device at a time please!");
}
audioDevice = this;
@@ -57,39 +57,39 @@ AndroidAUD_OpenDevice(_THIS, const char *devname, int iscapture)
SDL_memset(this->hidden, 0, (sizeof *this->hidden));
test_format = SDL_FirstAudioFormat(this->spec.format);
while (test_format != 0) { // no "UNKNOWN" constant
while (test_format != 0) { /* no "UNKNOWN" constant */
if ((test_format == AUDIO_U8) || (test_format == AUDIO_S16LSB)) {
this->spec.format = test_format;
break;
}
test_format = SDL_NextAudioFormat();
}
if (test_format == 0) {
// Didn't find a compatible format :(
return SDL_SetError("No compatible audio format!");
/* Didn't find a compatible format :( */
return SDL_SetError("No compatible audio format!");
}
if (this->spec.channels > 1) {
this->spec.channels = 2;
this->spec.channels = 2;
} else {
this->spec.channels = 1;
this->spec.channels = 1;
}
if (this->spec.freq < 8000) {
this->spec.freq = 8000;
this->spec.freq = 8000;
}
if (this->spec.freq > 48000) {
this->spec.freq = 48000;
this->spec.freq = 48000;
}
// TODO: pass in/return a (Java) device ID, also whether we're opening for input or output
/* TODO: pass in/return a (Java) device ID, also whether we're opening for input or output */
this->spec.samples = Android_JNI_OpenAudioDevice(this->spec.freq, this->spec.format == AUDIO_U8 ? 0 : 1, this->spec.channels, this->spec.samples);
SDL_CalculateAudioSpec(&this->spec);
if (this->spec.samples == 0) {
// Init failed?
return SDL_SetError("Java-side initialization failed!");
/* Init failed? */
return SDL_SetError("Java-side initialization failed!");
}
return 0;
@@ -111,13 +111,13 @@ static void
AndroidAUD_CloseDevice(_THIS)
{
if (this->hidden != NULL) {
SDL_free(this->hidden);
this->hidden = NULL;
SDL_free(this->hidden);
this->hidden = NULL;
}
Android_JNI_CloseAudioDevice();
Android_JNI_CloseAudioDevice();
if (audioDevice == this) {
audioDevice = NULL;
audioDevice = NULL;
}
}
@@ -132,7 +132,7 @@ AndroidAUD_Init(SDL_AudioDriverImpl * impl)
/* and the capabilities */
impl->ProvidesOwnCallbackThread = 1;
impl->HasCaptureSupport = 0; //TODO
impl->HasCaptureSupport = 0; /* TODO */
impl->OnlyHasDefaultOutputDevice = 1;
impl->OnlyHasDefaultInputDevice = 1;
@@ -147,7 +147,7 @@ AudioBootStrap ANDROIDAUD_bootstrap = {
void
Android_RunAudioThread()
{
SDL_RunAudio(audioDevice);
SDL_RunAudio(audioDevice);
}
#endif /* SDL_AUDIO_DRIVER_ANDROID */

2
src/audio/android/SDL_androidaudio.h
View File

@@ -26,7 +26,7 @@
#include "../SDL_sysaudio.h"
/* Hidden "this" pointer for the audio functions */
#define _THIS SDL_AudioDevice *this
#define _THIS SDL_AudioDevice *this
struct SDL_PrivateAudioData
{