AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-16 02:56:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split up Audio_PlaySound and partially move into backend

Browse Source
This commit is contained in:
UnknownShadow200 2021-08-12 19:15:32 +10:00
parent 37dfbcfefd
commit ad79a63b05
1 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/Audio.c
View File

@ -49,10 +49,13 @@ static int GetVolume(const char* volKey, const char* boolKey) {
return volume; return volume;
} }
/* Common/Base methods */
static void AudioWarn(cc_result res, const char* action) { static void AudioWarn(cc_result res, const char* action) {
Logger_Warn(res, action, Audio_DescribeError); Logger_Warn(res, action, Audio_DescribeError);
} }
static void AudioContext_Clear(struct AudioContext* ctx); static void AudioBase_Clear(struct AudioContext* ctx);
static void* AudioBase_AdjustSound(struct AudioContext* ctx, struct Sound* snd, int volume);
static cc_result AudioBase_PlaySound(struct AudioContext* ctx, struct Sound* snd, void* data);
#if defined CC_BUILD_OPENAL #if defined CC_BUILD_OPENAL
@ -218,7 +221,7 @@ void Audio_Close(struct AudioContext* ctx) {
_alGetError(); _alGetError();
} }
ClearFree(ctx->source); ClearFree(ctx->source);
AudioContext_Clear(ctx); AudioBase_Clear(ctx);
} }
cc_result Audio_SetFormat(struct AudioContext* ctx, int channels, int sampleRate) { cc_result Audio_SetFormat(struct AudioContext* ctx, int channels, int sampleRate) {
@ -291,6 +294,12 @@ cc_bool Audio_FastPlay(struct AudioContext* ctx, int channels, int sampleRate) {
return true; return true;
} }
cc_result Audio_PlaySound(struct AudioContext* ctx, struct Sound* snd, int volume) {
void* data = AudioBase_AdjustSound(ctx, snd, volume);
if (data) return AudioBase_PlaySound(ctx, snd, data);
return ERR_OUT_OF_MEMORY;
}
static const char* GetError(cc_result res) { static const char* GetError(cc_result res) {
switch (res) { switch (res) {
case AL_ERR_INIT_CONTEXT: return "Failed to init OpenAL context"; case AL_ERR_INIT_CONTEXT: return "Failed to init OpenAL context";
@ -402,7 +411,7 @@ void Audio_Close(struct AudioContext* ctx) {
Audio_Poll(ctx, &inUse); /* unprepare buffers */ Audio_Poll(ctx, &inUse); /* unprepare buffers */
Audio_Reset(ctx); Audio_Reset(ctx);
} }
AudioContext_Clear(ctx); AudioBase_Clear(ctx);
} }
cc_result Audio_SetFormat(struct AudioContext* ctx, int channels, int sampleRate) { cc_result Audio_SetFormat(struct AudioContext* ctx, int channels, int sampleRate) {
@ -473,6 +482,12 @@ cc_bool Audio_FastPlay(struct AudioContext* ctx, int channels, int sampleRate) {
return !ctx->channels || (ctx->channels == channels && ctx->sampleRate == sampleRate); return !ctx->channels || (ctx->channels == channels && ctx->sampleRate == sampleRate);
} }
cc_result Audio_PlaySound(struct AudioContext* ctx, struct Sound* snd, int volume) {
void* data = AudioBase_AdjustSound(ctx, snd, volume);
if (data) return AudioBase_PlaySound(ctx, snd, data);
return ERR_OUT_OF_MEMORY;
}
cc_bool Audio_DescribeError(cc_result res, cc_string* dst) { cc_bool Audio_DescribeError(cc_result res, cc_string* dst) {
char buffer[NATIVE_STR_LEN] = { 0 }; char buffer[NATIVE_STR_LEN] = { 0 };
waveOutGetErrorTextA(res, buffer, NATIVE_STR_LEN); waveOutGetErrorTextA(res, buffer, NATIVE_STR_LEN);
@ -592,7 +607,7 @@ static void Audio_Reset(struct AudioContext* ctx) {
void Audio_Close(struct AudioContext* ctx) { void Audio_Close(struct AudioContext* ctx) {
Audio_Stop(ctx); Audio_Stop(ctx);
Audio_Reset(ctx); Audio_Reset(ctx);
AudioContext_Clear(ctx); AudioBase_Clear(ctx);
} }
cc_result Audio_SetFormat(struct AudioContext* ctx, int channels, int sampleRate) { cc_result Audio_SetFormat(struct AudioContext* ctx, int channels, int sampleRate) {
@ -669,6 +684,12 @@ cc_bool Audio_FastPlay(struct AudioContext* ctx, int channels, int sampleRate) {
return !ctx->channels || (ctx->channels == channels && ctx->sampleRate == sampleRate); return !ctx->channels || (ctx->channels == channels && ctx->sampleRate == sampleRate);
} }
cc_result Audio_PlaySound(struct AudioContext* ctx, struct Sound* snd, int volume) {
void* data = AudioBase_AdjustSound(ctx, snd, volume);
if (data) return AudioBase_PlaySound(ctx, snd, data);
return ERR_OUT_OF_MEMORY;
}
static const char* GetError(cc_result res) { static const char* GetError(cc_result res) {
switch (res) { switch (res) {
case SL_RESULT_PRECONDITIONS_VIOLATED: return "Preconditions violated"; case SL_RESULT_PRECONDITIONS_VIOLATED: return "Preconditions violated";
@ -704,7 +725,7 @@ cc_bool Audio_DescribeError(cc_result res, cc_string* dst) {
#ifndef AUDIO_HAS_BACKEND #ifndef AUDIO_HAS_BACKEND
static void AudioBackend_Free(void) { } static void AudioBackend_Free(void) { }
#else #else
static void AudioContext_Clear(struct AudioContext* ctx) { static void AudioBase_Clear(struct AudioContext* ctx) {
ctx->count = 0; ctx->count = 0;
ctx->channels = 0; ctx->channels = 0;
ctx->sampleRate = 0; ctx->sampleRate = 0;
@ -714,31 +735,32 @@ static void AudioContext_Clear(struct AudioContext* ctx) {
ctx->_tmpSize = 0; ctx->_tmpSize = 0;
} }
cc_result Audio_PlaySound(struct AudioContext* ctx, struct Sound* snd, int volume) { static void* AudioBase_AdjustSound(struct AudioContext* ctx, struct Sound* snd, int volume) {
cc_result res; void* data;
void* data = snd->data; if (volume >= 100) return snd->data;
void* tmp;
/* copy to temp buffer to apply volume */
if (volume < 100) {
if (ctx->_tmpSize < snd->size) {
/* TODO: check if we can realloc NULL without a problem */
if (ctx->_tmpData) {
tmp = Mem_TryRealloc(ctx->_tmpData, snd->size, 1);
} else {
tmp = Mem_TryAlloc(snd->size, 1);
}
if (!tmp) return ERR_OUT_OF_MEMORY; /* copy to temp buffer to apply volume */
ctx->_tmpData = tmp; if (ctx->_tmpSize < snd->size) {
ctx->_tmpSize = snd->size; /* TODO: check if we can realloc NULL without a problem */
if (ctx->_tmpData) {
data = Mem_TryRealloc(ctx->_tmpData, snd->size, 1);
} else {
data = Mem_TryAlloc(snd->size, 1);
} }
data = ctx->_tmpData; if (!data) return NULL;
Mem_Copy(data, snd->data, snd->size); ctx->_tmpData = data;
ApplyVolume((cc_int16*)data, snd->size / 2, volume); ctx->_tmpSize = snd->size;
} }
data = ctx->_tmpData;
Mem_Copy(data, snd->data, snd->size);
ApplyVolume((cc_int16*)data, snd->size / 2, volume);
return data;
}
static cc_result AudioBase_PlaySound(struct AudioContext* ctx, struct Sound* snd, void* data) {
cc_result res;
if ((res = Audio_SetFormat(ctx, snd->channels, snd->sampleRate))) return res; if ((res = Audio_SetFormat(ctx, snd->channels, snd->sampleRate))) return res;
if ((res = Audio_QueueData(ctx, data, snd->size))) return res; if ((res = Audio_QueueData(ctx, data, snd->size))) return res;
if ((res = Audio_Play(ctx))) return res; if ((res = Audio_Play(ctx))) return res;