Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

add additional instrumentation to vsrc_latch to diagnose sound bug (see http://www.wildfiregames.com/forum/index.php?showtopic=11999)

Browse Source 
This was SVN commit r6400.
This commit is contained in:
janwas 2008-09-18 18:28:14 +00:00
parent 0d79703fb0
commit 33ca85cb4c
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/lib/res/sound/snd_mgr.cpp
View File

@ -95,20 +95,10 @@ static LibError list_free_all();
static void hsd_list_free_all();
/**
* check if OpenAL indicates an error has occurred. it can only report one
* error at a time, so this is called before and after every OpenAL request.
*
* @param caller Name of calling function (typically passed via __func__)
*/
static void al_check(const char* caller = "(unknown)")
static void al_ReportError(ALenum err, const char* caller)
{
debug_assert(al_initialized);
ALenum err = alGetError();
if(err == AL_NO_ERROR)
return;
// count # times we've been called for the same function (this shows
// which of multiple AL_CHECK inside a function is the culprit)
static const char* last_caller;
@ -126,6 +116,19 @@ static void al_check(const char* caller = "(unknown)")
debug_assert(0);
}
/**
* check if OpenAL indicates an error has occurred. it can only report one
* error at a time, so this is called before and after every OpenAL request.
*
* @param caller Name of calling function (typically passed via __func__)
*/
static void al_check(const char* caller = "(unknown)")
{
ALenum err = alGetError();
if(err != AL_NO_ERROR)
al_ReportError(err, caller);
}
// convenience version that automatically passes in function name.
#define AL_CHECK al_check(__func__)
@ -1436,19 +1439,10 @@ static void vsrc_latch(VSrc* vs)
{
if(!vs->al_src)
return;
debug_assert(alIsSource(vs->al_src));
AL_CHECK;
#ifndef NDEBUG
// paranoid value checking; helps determine which parameter is
// the problem when the below AL_CHECK fails.
debug_assert(!isnan(vs->pos[0]) && !isnan(vs->pos[1]) && !isnan(vs->pos[2]));
debug_assert(vs->relative == AL_TRUE || vs->relative == AL_FALSE);
debug_assert(!isnan(vs->gain) && vs->gain >= 0.0f);
debug_assert(!isnan(vs->pitch) && vs->pitch > 0.0f);
debug_assert(vs->loop == AL_TRUE || vs->loop == AL_FALSE);
#endif
alSourcefv(vs->al_src, AL_POSITION, vs->pos);
alSourcei (vs->al_src, AL_SOURCE_RELATIVE, vs->relative);
if(vs->relative)
@ -1457,7 +1451,19 @@ static void vsrc_latch(VSrc* vs)
alSourcef (vs->al_src, AL_PITCH, vs->pitch);
alSourcei (vs->al_src, AL_LOOPING, vs->loop);
AL_CHECK;
ALenum err = alGetError();
if(err != AL_NO_ERROR)
{
debug_printf("vsrc_latch: one of the below is invalid:\n");
debug_printf(" al_src: %d\n", vs->al_src);
debug_printf(" pos: %f %f %f\n", vs->pos[0], vs->pos[1], vs->pos[2]);
debug_printf(" relative: %d\n", (int)vs->relative);
debug_printf(" gain: %f\n", vs->gain);
debug_printf(" pitch: %f\n", vs->pitch);
debug_printf(" loop: %d\n", (int)vs->loop);
al_ReportError(err, __func__);
}
}