Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-08-14 14:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Refactor : shuffled code locations to eliminate forward declarations

Browse Source
This commit is contained in:
Aaron Culliney
2015-06-20 11:51:15 -07:00
parent 7b0c5be7c8
commit 8ab4c18de5
1 changed files with 98 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

200
src/audio/soundcore-openal.c
View File

@@ -67,9 +67,6 @@ static ALVoices *voices = NULL;
static AudioBackend_s openal_audio_backend = { 0 };
static long OpenALCreateSoundBuffer(const AudioParams_s *params, INOUT AudioBuffer_s **soundbuf_struct, const AudioContext_s *audio_context);
static long OpenALDestroySoundBuffer(INOUT AudioBuffer_s **soundbuf_struct);
// ----------------------------------------------------------------------------
// uthash of OpenAL buffers
@@ -141,93 +138,6 @@ static void PlaylistDequeue(ALVoice *voice, ALPlayBuf *node) {
// ----------------------------------------------------------------------------
static long openal_systemSetup(INOUT AudioContext_s **audio_context) {
assert(*audio_context == NULL);
assert(voices == NULL);
ALCcontext *ctx = NULL;
do {
if ((ctx = InitAL()) == NULL) {
ERRLOG("OOPS, OpenAL initialize failed");
break;
}
if (alIsExtensionPresent("AL_SOFT_buffer_samples")) {
LOG("AL_SOFT_buffer_samples supported, good!");
} else {
LOG("WARNING - AL_SOFT_buffer_samples extension not supported... Proceeding anyway...");
}
if ((*audio_context = malloc(sizeof(AudioContext_s))) == NULL) {
ERRLOG("OOPS, Not enough memory");
break;
}
(*audio_context)->_internal = ctx;
(*audio_context)->CreateSoundBuffer = &OpenALCreateSoundBuffer;
(*audio_context)->DestroySoundBuffer = &OpenALDestroySoundBuffer;
return 0;
} while(0);
// ERRQUIT
if (*audio_context) {
FREE(*audio_context);
}
return -1;
}
static long openal_systemShutdown(INOUT AudioContext_s **audio_context) {
assert(*audio_context != NULL);
ALCcontext *ctx = (ALCcontext*) (*audio_context)->_internal;
assert(ctx != NULL);
(*audio_context)->_internal = NULL;
FREE(*audio_context);
CloseAL();
return 0;
}
// pause all audio
static long openal_systemPause(void) {
ALVoices *vnode = NULL;
ALVoices *tmp = NULL;
long err = 0;
HASH_ITER(hh, voices, vnode, tmp) {
alSourcePause(vnode->source);
err = alGetError();
if (err != AL_NO_ERROR) {
ERRLOG("OOPS, Failed to pause source : 0x%08lx", err);
}
}
return 0;
}
static long openal_systemResume(void) {
ALVoices *vnode = NULL;
ALVoices *tmp = NULL;
long err = 0;
HASH_ITER(hh, voices, vnode, tmp) {
alSourcePlay(vnode->source);
err = alGetError();
if (err != AL_NO_ERROR) {
ERRLOG("OOPS, Failed to pause source : 0x%08lx", err);
}
}
return 0;
}
// ----------------------------------------------------------------------------
/*
* Destroys a voice object, deleting the source and buffers. Minimal error
* handling since these calls shouldn't fail with a properly-made voice object.
@@ -614,6 +524,29 @@ static long ALGetStatus(AudioBuffer_s *_this, OUTPARM unsigned long *status) {
// ----------------------------------------------------------------------------
static long OpenALDestroySoundBuffer(INOUT AudioBuffer_s **soundbuf_struct) {
if (!*soundbuf_struct) {
// already dealloced
return 0;
}
LOG("OpenALDestroySoundBuffer ...");
ALVoice *voice = (ALVoice *)((*soundbuf_struct)->_internal);
ALint source = voice->source;
DeleteVoice(voice);
ALVoices *vnode = NULL;
HASH_FIND_INT(voices, &source, vnode);
if (vnode) {
HASH_DEL(voices, vnode);
FREE(vnode);
}
FREE(*soundbuf_struct);
return 0;
}
static long OpenALCreateSoundBuffer(const AudioParams_s *params, INOUT AudioBuffer_s **soundbuf_struct, const AudioContext_s *audio_context) {
LOG("OpenALCreateSoundBuffer ...");
assert(*soundbuf_struct == NULL);
@@ -666,26 +599,89 @@ static long OpenALCreateSoundBuffer(const AudioParams_s *params, INOUT AudioBuff
return -1;
}
static long OpenALDestroySoundBuffer(INOUT AudioBuffer_s **soundbuf_struct) {
if (!*soundbuf_struct) {
// already dealloced
// ----------------------------------------------------------------------------
static long openal_systemSetup(INOUT AudioContext_s **audio_context) {
assert(*audio_context == NULL);
assert(voices == NULL);
ALCcontext *ctx = NULL;
do {
if ((ctx = InitAL()) == NULL) {
ERRLOG("OOPS, OpenAL initialize failed");
break;
}
if (alIsExtensionPresent("AL_SOFT_buffer_samples")) {
LOG("AL_SOFT_buffer_samples supported, good!");
} else {
LOG("WARNING - AL_SOFT_buffer_samples extension not supported... Proceeding anyway...");
}
if ((*audio_context = malloc(sizeof(AudioContext_s))) == NULL) {
ERRLOG("OOPS, Not enough memory");
break;
}
(*audio_context)->_internal = ctx;
(*audio_context)->CreateSoundBuffer = &OpenALCreateSoundBuffer;
(*audio_context)->DestroySoundBuffer = &OpenALDestroySoundBuffer;
return 0;
} while(0);
// ERRQUIT
if (*audio_context) {
FREE(*audio_context);
}
LOG("OpenALDestroySoundBuffer ...");
ALVoice *voice = (ALVoice *)((*soundbuf_struct)->_internal);
ALint source = voice->source;
return -1;
}
DeleteVoice(voice);
static long openal_systemShutdown(INOUT AudioContext_s **audio_context) {
assert(*audio_context != NULL);
ALCcontext *ctx = (ALCcontext*) (*audio_context)->_internal;
assert(ctx != NULL);
(*audio_context)->_internal = NULL;
FREE(*audio_context);
CloseAL();
return 0;
}
static long openal_systemPause(void) {
ALVoices *vnode = NULL;
HASH_FIND_INT(voices, &source, vnode);
if (vnode) {
HASH_DEL(voices, vnode);
FREE(vnode);
ALVoices *tmp = NULL;
long err = 0;
HASH_ITER(hh, voices, vnode, tmp) {
alSourcePause(vnode->source);
err = alGetError();
if (err != AL_NO_ERROR) {
ERRLOG("OOPS, Failed to pause source : 0x%08lx", err);
}
}
return 0;
}
static long openal_systemResume(void) {
ALVoices *vnode = NULL;
ALVoices *tmp = NULL;
long err = 0;
HASH_ITER(hh, voices, vnode, tmp) {
alSourcePlay(vnode->source);
err = alGetError();
if (err != AL_NO_ERROR) {
ERRLOG("OOPS, Failed to pause source : 0x%08lx", err);
}
}
FREE(*soundbuf_struct);
return 0;
}