r389 - trunk/code/client
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Nov 29 20:57:53 EST 2005
Author: tma
Date: 2005-11-29 20:57:53 -0500 (Tue, 29 Nov 2005)
New Revision: 389
Modified:
trunk/code/client/snd_codec_wav.c
trunk/code/client/snd_openal.c
Log:
* Support RIFF files with zero length data chunks (yes they exist, and yes,
they're legal)
* Colourise the OpenAL warnings so they're somewhat more obvious
Modified: trunk/code/client/snd_codec_wav.c
===================================================================
--- trunk/code/client/snd_codec_wav.c 2005-11-29 03:31:31 UTC (rev 388)
+++ trunk/code/client/snd_codec_wav.c 2005-11-30 01:57:53 UTC (rev 389)
@@ -63,12 +63,12 @@
r = FS_Read(name, 4, f);
if(r != 4)
- return 0;
+ return -1;
len = FGetLittleLong(f);
if( len < 0 ) {
Com_Printf( S_COLOR_YELLOW "WARNING: Negative chunk length\n" );
- return 0;
+ return -1;
}
return len;
@@ -78,14 +78,14 @@
=================
S_FindRIFFChunk
-Returns the length of the data in the chunk, or 0 if not found
+Returns the length of the data in the chunk, or -1 if not found
=================
*/
static int S_FindRIFFChunk( fileHandle_t f, char *chunk ) {
char name[5];
int len;
- while( ( len = S_ReadChunkInfo(f, name) ) )
+ while( ( len = S_ReadChunkInfo(f, name) ) >= 0 )
{
// If this is the right chunk, return
if( !Q_strncmp( name, chunk, 4 ) )
@@ -97,7 +97,7 @@
FS_Seek( f, len, FS_SEEK_CUR );
}
- return 0;
+ return -1;
}
/*
@@ -138,7 +138,7 @@
FS_Read(dump, 12, file);
// Scan for the format chunk
- if((fmtlen = S_FindRIFFChunk(file, "fmt ")) == 0)
+ if((fmtlen = S_FindRIFFChunk(file, "fmt ")) < 0)
{
Com_Printf( S_COLOR_RED "ERROR: Couldn't find \"fmt\" chunk\n");
return qfalse;
@@ -161,7 +161,7 @@
}
// Scan for the data chunk
- if( (info->size = S_FindRIFFChunk(file, "data")) == 0)
+ if( (info->size = S_FindRIFFChunk(file, "data")) < 0)
{
Com_Printf( S_COLOR_RED "ERROR: Couldn't find \"data\" chunk\n");
return qfalse;
Modified: trunk/code/client/snd_openal.c
===================================================================
--- trunk/code/client/snd_openal.c 2005-11-29 03:31:31 UTC (rev 388)
+++ trunk/code/client/snd_openal.c 2005-11-30 01:57:53 UTC (rev 389)
@@ -190,7 +190,7 @@
if(sfx == default_sfx)
Com_Error(ERR_FATAL, "Can't load default sound effect %s\n", knownSfx[sfx].filename);
- Com_Printf( "Warning: Using default sound for %s\n", knownSfx[sfx].filename);
+ Com_Printf( S_COLOR_YELLOW "WARNING: Using default sound for %s\n", knownSfx[sfx].filename);
knownSfx[sfx].isDefault = qtrue;
knownSfx[sfx].buffer = knownSfx[default_sfx].buffer;
}
@@ -237,7 +237,6 @@
data = S_CodecLoad(knownSfx[sfx].filename, &info);
if(!data)
{
- Com_Printf( "Can't load %s\n", knownSfx[sfx].filename);
S_AL_BufferUseDefault(sfx);
return;
}
@@ -250,13 +249,22 @@
{
S_AL_BufferUseDefault(sfx);
Z_Free(data);
- Com_Printf( "Can't create a sound buffer for %s - %s\n", knownSfx[sfx].filename, S_AL_ErrorMsg(error));
+ Com_Printf( S_COLOR_RED "ERROR: Can't create a sound buffer for %s - %s\n",
+ knownSfx[sfx].filename, S_AL_ErrorMsg(error));
return;
}
// Fill the buffer
- qalGetError();
- qalBufferData(knownSfx[sfx].buffer, format, data, info.size, info.rate);
+ if( info.size == 0 )
+ {
+ // We have no data to buffer, so buffer silence
+ byte dummyData[ 2 ] = { 0 };
+
+ qalBufferData(knownSfx[sfx].buffer, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050);
+ }
+ else
+ qalBufferData(knownSfx[sfx].buffer, format, data, info.size, info.rate);
+
error = qalGetError();
// If we ran out of memory, start evicting the least recently used sounds
@@ -267,12 +275,11 @@
{
S_AL_BufferUseDefault(sfx);
Z_Free(data);
- Com_Printf( "Out of memory loading %s\n", knownSfx[sfx].filename);
+ Com_Printf( S_COLOR_RED "ERROR: Out of memory loading %s\n", knownSfx[sfx].filename);
return;
}
// Try load it again
- qalGetError();
qalBufferData(knownSfx[sfx].buffer, format, data, info.size, info.rate);
error = qalGetError();
}
@@ -282,7 +289,8 @@
{
S_AL_BufferUseDefault(sfx);
Z_Free(data);
- Com_Printf( "Can't fill sound buffer for %s - %s", knownSfx[sfx].filename, S_AL_ErrorMsg(error));
+ Com_Printf( S_COLOR_RED "ERROR: Can't fill sound buffer for %s - %s\n",
+ knownSfx[sfx].filename, S_AL_ErrorMsg(error));
return;
}
@@ -352,7 +360,8 @@
// Delete it
qalDeleteBuffers(1, &knownSfx[sfx].buffer);
if((error = qalGetError()) != AL_NO_ERROR)
- Com_Printf( "Can't delete sound buffer for %s", knownSfx[sfx].filename);
+ Com_Printf( S_COLOR_RED "ERROR: Can't delete sound buffer for %s\n",
+ knownSfx[sfx].filename);
knownSfx[sfx].inMemory = qfalse;
}
@@ -509,7 +518,7 @@
for(i = 0; i < srcCount; i++)
{
if(srcList[i].isLocked)
- Com_DPrintf("Warning: Source %d is locked\n", i);
+ Com_DPrintf( S_COLOR_YELLOW "WARNING: Source %d is locked\n", i);
qalSourceStop(srcList[i].source);
qalDeleteSources(1, &srcList[i].source);
@@ -1060,7 +1069,7 @@
// Failed?
if(streamSourceHandle == -1)
{
- Com_Printf( "Can't allocate streaming streamSource\n");
+ Com_Printf( S_COLOR_RED "ERROR: Can't allocate streaming streamSource\n");
return;
}
}
@@ -1230,11 +1239,13 @@
static
void S_AL_MusicProcess(ALuint b)
{
+ ALenum error;
int l;
ALuint format;
l = S_CodecReadStream(mus_stream, MUSIC_BUFFER_SIZE, decode_buffer);
+ // Run out data to read, start at the beginning again
if(l == 0)
{
S_CodecCloseStream(mus_stream);
@@ -1249,7 +1260,24 @@
}
format = S_AL_Format(mus_stream->info.width, mus_stream->info.channels);
- qalBufferData(b, format, decode_buffer, l, mus_stream->info.rate);
+
+ if( l == 0 )
+ {
+ // We have no data to buffer, so buffer silence
+ byte dummyData[ 2 ] = { 0 };
+
+ qalBufferData( b, AL_FORMAT_MONO16, (void *)dummyData, 2, 22050 );
+ }
+ else
+ qalBufferData(b, format, decode_buffer, l, mus_stream->info.rate);
+
+ if( ( error = qalGetError( ) ) != AL_NO_ERROR )
+ {
+ S_AL_StopBackgroundTrack( );
+ Com_Printf( S_COLOR_RED "ERROR: while buffering data for music stream - %s\n",
+ S_AL_ErrorMsg( error ) );
+ return;
+ }
}
/*
@@ -1546,7 +1574,7 @@
// Load QAL
if( !QAL_Init( s_alDriver->string ) )
{
- Com_Printf( "Failed to load library: \"%s\".\n", s_alDriver->string );
+ Com_Printf( "Failed to load library: \"%s\".\n", s_alDriver->string );
return qfalse;
}
@@ -1555,7 +1583,7 @@
if( !alDevice )
{
QAL_Shutdown( );
- Com_Printf( "Failed to open OpenAL device.\n" );
+ Com_Printf( "Failed to open OpenAL device.\n" );
return qfalse;
}
@@ -1565,7 +1593,7 @@
{
QAL_Shutdown( );
qalcCloseDevice( alDevice );
- Com_Printf( "Failed to create OpenAL context.\n" );
+ Com_Printf( "Failed to create OpenAL context.\n" );
return qfalse;
}
qalcMakeContextCurrent( alContext );
More information about the quake3-commits
mailing list