2010-02-15 23:26:55 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 1996-2001 Id Software, Inc.
|
2011-01-30 21:34:12 +00:00
|
|
|
Copyright (C) 2010-2011 O. Sezer <sezero@users.sourceforge.net>
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
|
|
modify it under the terms of the GNU General Public License
|
|
|
|
as published by the Free Software Foundation; either version 2
|
|
|
|
of the License, or (at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
|
|
|
|
See the GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
|
|
|
// snd_mem.c: sound caching
|
|
|
|
|
|
|
|
#include "quakedef.h"
|
2018-06-28 04:40:25 +00:00
|
|
|
#include "snd_codec.h"
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
ResampleSfx
|
|
|
|
================
|
|
|
|
*/
|
2010-12-30 21:10:26 +00:00
|
|
|
static void ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte *data)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int outcount;
|
|
|
|
int srcsample;
|
|
|
|
float stepscale;
|
|
|
|
int i;
|
|
|
|
int sample, samplefrac, fracstep;
|
|
|
|
sfxcache_t *sc;
|
|
|
|
|
host_cmd.c, console.c, gl_draw.c, image.c, gl_model.c, r_sprite.c, cl_parse.c,
gl_warp.c, host.c, gl_mesh.c, gl_sky.c, gl_texmgr.c, cvar.c, sv_main.c, cvar.h,
gl_screen.c, r_brush.c, gl_vidsdl.c, zone.c, cl_main.c, cmd.c, snd_dma.c,
snd_mem.c, common.c, sv_phys.c: Added explicit casts to eliminate -Wc++-compat
warnings.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@170 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-05-31 07:42:36 +00:00
|
|
|
sc = (sfxcache_t *) Cache_Check (&sfx->cache);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!sc)
|
|
|
|
return;
|
|
|
|
|
|
|
|
stepscale = (float)inrate / shm->speed; // this is usually 0.5, 1, or 2
|
|
|
|
|
|
|
|
outcount = sc->length / stepscale;
|
|
|
|
sc->length = outcount;
|
|
|
|
if (sc->loopstart != -1)
|
|
|
|
sc->loopstart = sc->loopstart / stepscale;
|
|
|
|
|
|
|
|
sc->speed = shm->speed;
|
|
|
|
if (loadas8bit.value)
|
|
|
|
sc->width = 1;
|
|
|
|
else
|
|
|
|
sc->width = inwidth;
|
2017-09-17 02:12:53 +00:00
|
|
|
if (sc->stereo == 1)
|
|
|
|
{ //crappy approach to stereo - strip it out by merging left+right channels
|
|
|
|
sc->stereo = 0;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
samplefrac = 0;
|
|
|
|
fracstep = stepscale*256;
|
2010-12-30 21:10:26 +00:00
|
|
|
for (i = 0; i < outcount; i++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
srcsample = samplefrac >> 8;
|
2017-09-17 02:12:53 +00:00
|
|
|
srcsample<<=1;
|
2010-02-15 23:26:55 +00:00
|
|
|
samplefrac += fracstep;
|
|
|
|
if (inwidth == 2)
|
2017-09-17 02:12:53 +00:00
|
|
|
sample = LittleShort ( ((short *)data)[srcsample] ) + LittleShort ( ((short *)data)[srcsample+1] );
|
2010-02-15 23:26:55 +00:00
|
|
|
else
|
2017-09-17 02:12:53 +00:00
|
|
|
sample = ((int)( (unsigned char)(data[srcsample]) - 128) << 8) + ((int)( (unsigned char)(data[srcsample+1]) - 128) << 8);
|
|
|
|
sample /= 2;
|
2010-02-15 23:26:55 +00:00
|
|
|
if (sc->width == 2)
|
|
|
|
((short *)sc->data)[i] = sample;
|
|
|
|
else
|
|
|
|
((signed char *)sc->data)[i] = sample >> 8;
|
|
|
|
}
|
|
|
|
}
|
2017-09-17 02:12:53 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
// resample / decimate to the current source rate
|
|
|
|
|
|
|
|
if (stepscale == 1 && inwidth == 1 && sc->width == 1)
|
|
|
|
{
|
|
|
|
// fast special case
|
|
|
|
for (i = 0; i < outcount; i++)
|
|
|
|
((signed char *)sc->data)[i] = (int)( (unsigned char)(data[i]) - 128);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// general case
|
|
|
|
samplefrac = 0;
|
|
|
|
fracstep = stepscale*256;
|
|
|
|
for (i = 0; i < outcount; i++)
|
|
|
|
{
|
|
|
|
srcsample = samplefrac >> 8;
|
|
|
|
samplefrac += fracstep;
|
|
|
|
if (inwidth == 2)
|
|
|
|
sample = LittleShort ( ((short *)data)[srcsample] );
|
|
|
|
else
|
|
|
|
sample = (int)( (unsigned char)(data[srcsample]) - 128) << 8;
|
|
|
|
if (sc->width == 2)
|
|
|
|
((short *)sc->data)[i] = sample;
|
|
|
|
else
|
|
|
|
((signed char *)sc->data)[i] = sample >> 8;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
==============
|
|
|
|
S_LoadSound
|
|
|
|
==============
|
|
|
|
*/
|
|
|
|
sfxcache_t *S_LoadSound (sfx_t *s)
|
|
|
|
{
|
2010-08-29 02:22:55 +00:00
|
|
|
char namebuffer[256];
|
2010-02-15 23:26:55 +00:00
|
|
|
byte *data;
|
|
|
|
wavinfo_t info;
|
|
|
|
int len;
|
|
|
|
float stepscale;
|
|
|
|
sfxcache_t *sc;
|
|
|
|
byte stackbuf[1*1024]; // avoid dirtying the cache heap
|
|
|
|
|
|
|
|
// see if still in memory
|
host_cmd.c, console.c, gl_draw.c, image.c, gl_model.c, r_sprite.c, cl_parse.c,
gl_warp.c, host.c, gl_mesh.c, gl_sky.c, gl_texmgr.c, cvar.c, sv_main.c, cvar.h,
gl_screen.c, r_brush.c, gl_vidsdl.c, zone.c, cl_main.c, cmd.c, snd_dma.c,
snd_mem.c, common.c, sv_phys.c: Added explicit casts to eliminate -Wc++-compat
warnings.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@170 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-05-31 07:42:36 +00:00
|
|
|
sc = (sfxcache_t *) Cache_Check (&s->cache);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (sc)
|
|
|
|
return sc;
|
|
|
|
|
2010-10-18 20:39:10 +00:00
|
|
|
// Con_Printf ("S_LoadSound: %x\n", (int)stackbuf);
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
// load it in
|
2011-12-27 13:15:31 +00:00
|
|
|
q_strlcpy(namebuffer, "sound/", sizeof(namebuffer));
|
|
|
|
q_strlcat(namebuffer, s->name, sizeof(namebuffer));
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2018-06-28 04:40:25 +00:00
|
|
|
if (strcmp("wav", COM_FileGetExtension(s->name)))
|
|
|
|
{ //if its an ogg (or even an mp3) then decode it now. our mixer doesn't support streaming anything but music.
|
|
|
|
//FIXME: I hate depending on extensions for this sort of thing. Its not a very quakey thing to do.
|
|
|
|
snd_stream_t *stream = S_CodecOpenStreamExt(namebuffer);
|
|
|
|
if (!stream)
|
|
|
|
stream = S_CodecOpenStreamExt(s->name);
|
|
|
|
if (stream)
|
|
|
|
{
|
|
|
|
size_t decodedsize = 1024*1024*16;
|
|
|
|
void *decoded = malloc(decodedsize);
|
|
|
|
int res = S_CodecReadStream(stream, decodedsize, decoded);
|
|
|
|
int len;
|
|
|
|
S_CodecCloseStream(stream);
|
|
|
|
|
|
|
|
res /= stream->info.width*stream->info.channels;
|
|
|
|
|
|
|
|
stepscale = (float)stream->info.rate / shm->speed;
|
|
|
|
len = res / stepscale;
|
|
|
|
len = len * stream->info.width;// * info.channels;
|
|
|
|
|
|
|
|
sc = (sfxcache_t *) Cache_Alloc ( &s->cache, res + sizeof(sfxcache_t), s->name);
|
|
|
|
if (!sc)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
sc->length = res / stream->info.channels;
|
|
|
|
sc->loopstart = -1;
|
|
|
|
sc->speed = stream->info.rate;
|
|
|
|
sc->width = stream->info.width;
|
|
|
|
sc->stereo = stream->info.channels-1;
|
|
|
|
|
|
|
|
ResampleSfx (s, sc->speed, sc->width, decoded);
|
|
|
|
free(decoded);
|
|
|
|
return sc;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
// Con_Printf ("loading %s\n",namebuffer);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-01-02 21:45:16 +00:00
|
|
|
data = COM_LoadStackFile(namebuffer, stackbuf, sizeof(stackbuf), NULL);
|
2018-07-07 14:05:34 +00:00
|
|
|
if (!data)
|
|
|
|
data = COM_LoadStackFile(s->name, stackbuf, sizeof(stackbuf), NULL);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (!data)
|
|
|
|
{
|
|
|
|
Con_Printf ("Couldn't load %s\n", namebuffer);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
info = GetWavinfo (s->name, data, com_filesize);
|
2017-09-17 02:12:53 +00:00
|
|
|
if (info.channels != 1 && info.channels != 2)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
Con_Printf ("%s is a stereo sample\n",s->name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-12-30 14:39:12 +00:00
|
|
|
if (info.width != 1 && info.width != 2)
|
|
|
|
{
|
|
|
|
Con_Printf("%s is not 8 or 16 bit\n", s->name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
stepscale = (float)info.rate / shm->speed;
|
|
|
|
len = info.samples / stepscale;
|
|
|
|
|
2017-09-17 02:12:53 +00:00
|
|
|
len = len * info.width;// * info.channels;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 14:39:12 +00:00
|
|
|
if (info.samples == 0 || len == 0)
|
|
|
|
{
|
|
|
|
Con_Printf("%s has zero samples\n", s->name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
host_cmd.c, console.c, gl_draw.c, image.c, gl_model.c, r_sprite.c, cl_parse.c,
gl_warp.c, host.c, gl_mesh.c, gl_sky.c, gl_texmgr.c, cvar.c, sv_main.c, cvar.h,
gl_screen.c, r_brush.c, gl_vidsdl.c, zone.c, cl_main.c, cmd.c, snd_dma.c,
snd_mem.c, common.c, sv_phys.c: Added explicit casts to eliminate -Wc++-compat
warnings.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@170 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-05-31 07:42:36 +00:00
|
|
|
sc = (sfxcache_t *) Cache_Alloc ( &s->cache, len + sizeof(sfxcache_t), s->name);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!sc)
|
|
|
|
return NULL;
|
|
|
|
|
2017-09-17 02:12:53 +00:00
|
|
|
sc->length = info.samples / info.channels;
|
2010-02-15 23:26:55 +00:00
|
|
|
sc->loopstart = info.loopstart;
|
|
|
|
sc->speed = info.rate;
|
|
|
|
sc->width = info.width;
|
2017-09-17 02:12:53 +00:00
|
|
|
sc->stereo = info.channels-1;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
ResampleSfx (s, sc->speed, sc->width, data + info.dataofs);
|
|
|
|
|
|
|
|
return sc;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
WAV loading
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static byte *data_p;
|
|
|
|
static byte *iff_end;
|
|
|
|
static byte *last_chunk;
|
|
|
|
static byte *iff_data;
|
|
|
|
static int iff_chunk_len;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static short GetLittleShort (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
short val = 0;
|
|
|
|
val = *data_p;
|
|
|
|
val = val + (*(data_p+1)<<8);
|
|
|
|
data_p += 2;
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static int GetLittleLong (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int val = 0;
|
|
|
|
val = *data_p;
|
|
|
|
val = val + (*(data_p+1)<<8);
|
|
|
|
val = val + (*(data_p+2)<<16);
|
|
|
|
val = val + (*(data_p+3)<<24);
|
|
|
|
data_p += 4;
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void FindNextChunk (const char *name)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
while (1)
|
|
|
|
{
|
2010-02-15 23:37:38 +00:00
|
|
|
// Need at least 8 bytes for a chunk
|
|
|
|
if (last_chunk + 8 >= iff_end)
|
|
|
|
{
|
2010-02-15 23:26:55 +00:00
|
|
|
data_p = NULL;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-02-15 23:37:38 +00:00
|
|
|
data_p = last_chunk + 4;
|
2010-02-15 23:26:55 +00:00
|
|
|
iff_chunk_len = GetLittleLong();
|
2010-02-15 23:37:38 +00:00
|
|
|
if (iff_chunk_len < 0 || iff_chunk_len > iff_end - data_p)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
data_p = NULL;
|
2015-05-25 18:38:37 +00:00
|
|
|
Con_DPrintf2("bad \"%s\" chunk length (%d)\n", name, iff_chunk_len);
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
|
|
|
}
|
2010-02-15 23:37:38 +00:00
|
|
|
last_chunk = data_p + ((iff_chunk_len + 1) & ~1);
|
2010-02-15 23:26:55 +00:00
|
|
|
data_p -= 8;
|
2010-02-15 23:37:38 +00:00
|
|
|
if (!Q_strncmp((char *)data_p, name, 4))
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void FindChunk (const char *name)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
last_chunk = iff_data;
|
|
|
|
FindNextChunk (name);
|
|
|
|
}
|
|
|
|
|
2010-10-18 20:39:10 +00:00
|
|
|
#if 0
|
2010-12-30 21:10:26 +00:00
|
|
|
static void DumpChunks (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
char str[5];
|
|
|
|
|
|
|
|
str[4] = 0;
|
2010-10-18 20:39:10 +00:00
|
|
|
data_p = iff_data;
|
2010-02-15 23:26:55 +00:00
|
|
|
do
|
|
|
|
{
|
|
|
|
memcpy (str, data_p, 4);
|
|
|
|
data_p += 4;
|
|
|
|
iff_chunk_len = GetLittleLong();
|
2010-12-30 21:10:26 +00:00
|
|
|
Con_Printf ("0x%x : %s (%d)\n", (int)(data_p - 4), str, iff_chunk_len);
|
2010-02-15 23:26:55 +00:00
|
|
|
data_p += (iff_chunk_len + 1) & ~1;
|
|
|
|
} while (data_p < iff_end);
|
|
|
|
}
|
2010-10-18 20:39:10 +00:00
|
|
|
#endif
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
============
|
|
|
|
GetWavinfo
|
|
|
|
============
|
|
|
|
*/
|
2010-08-29 02:22:55 +00:00
|
|
|
wavinfo_t GetWavinfo (const char *name, byte *wav, int wavlength)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
wavinfo_t info;
|
2010-12-30 21:10:26 +00:00
|
|
|
int i;
|
|
|
|
int format;
|
|
|
|
int samples;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
memset (&info, 0, sizeof(info));
|
|
|
|
|
|
|
|
if (!wav)
|
|
|
|
return info;
|
|
|
|
|
|
|
|
iff_data = wav;
|
|
|
|
iff_end = wav + wavlength;
|
|
|
|
|
|
|
|
// find "RIFF" chunk
|
|
|
|
FindChunk("RIFF");
|
chase.c, cl_input.c, cl_parse.c, client.h, common.c, common.h, console.h,
cvar.h, draw.h, gl_draw.c, gl_fog.c, gl_mesh.c, gl_model.c, gl_model.h,
gl_rmain.c, gl_rmisc.c, gl_screen.c, gl_sky.c, gl_texmgr.c, glquake.h,
host.c, keys.c, keys.h, main.c, menu.c, menu.h, pr_cmds.c, quakedef.h,
r_alias.c, r_brush.c, r_part.c, r_sprite.c, r_world.c, sbar.c, sbar.h,
screen.h, snd_dma.c, snd_mem.c, snd_mix.c, sv_main.c, sys_sdl.c, vid.h,
view.h, world.c, world.h: Loads of warning fixes about missing function
prototypes, missing parens around &, missing braces leading to ambiguous
else statements and unused and uninitialized variables. There are still a
couple of unitialised variables here and there, but not much. The warnings
about strict aliasing violations need taking care of.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@21 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-02-16 12:01:07 +00:00
|
|
|
if (!(data_p && !Q_strncmp((char *)data_p + 8, "WAVE", 4)))
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-12-30 14:39:12 +00:00
|
|
|
Con_Printf("%s missing RIFF/WAVE chunks\n", name);
|
2010-02-15 23:26:55 +00:00
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
// get "fmt " chunk
|
|
|
|
iff_data = data_p + 12;
|
2010-10-18 20:39:10 +00:00
|
|
|
#if 0
|
|
|
|
DumpChunks ();
|
|
|
|
#endif
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
FindChunk("fmt ");
|
|
|
|
if (!data_p)
|
|
|
|
{
|
2010-12-30 14:39:12 +00:00
|
|
|
Con_Printf("%s is missing fmt chunk\n", name);
|
2010-02-15 23:26:55 +00:00
|
|
|
return info;
|
|
|
|
}
|
|
|
|
data_p += 8;
|
|
|
|
format = GetLittleShort();
|
2010-12-30 14:39:12 +00:00
|
|
|
if (format != WAV_FORMAT_PCM)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-12-30 14:39:12 +00:00
|
|
|
Con_Printf("%s is not Microsoft PCM format\n", name);
|
2010-02-15 23:26:55 +00:00
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
info.channels = GetLittleShort();
|
|
|
|
info.rate = GetLittleLong();
|
2010-12-30 21:10:26 +00:00
|
|
|
data_p += 4 + 2;
|
2013-07-22 11:41:14 +00:00
|
|
|
i = GetLittleShort();
|
|
|
|
if (i != 8 && i != 16)
|
|
|
|
return info;
|
|
|
|
info.width = i / 8;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
// get cue chunk
|
|
|
|
FindChunk("cue ");
|
|
|
|
if (data_p)
|
|
|
|
{
|
|
|
|
data_p += 32;
|
|
|
|
info.loopstart = GetLittleLong();
|
2010-12-30 21:10:26 +00:00
|
|
|
// Con_Printf("loopstart=%d\n", sfx->loopstart);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
// if the next chunk is a LIST chunk, look for a cue length marker
|
|
|
|
FindNextChunk ("LIST");
|
|
|
|
if (data_p)
|
|
|
|
{
|
chase.c, cl_input.c, cl_parse.c, client.h, common.c, common.h, console.h,
cvar.h, draw.h, gl_draw.c, gl_fog.c, gl_mesh.c, gl_model.c, gl_model.h,
gl_rmain.c, gl_rmisc.c, gl_screen.c, gl_sky.c, gl_texmgr.c, glquake.h,
host.c, keys.c, keys.h, main.c, menu.c, menu.h, pr_cmds.c, quakedef.h,
r_alias.c, r_brush.c, r_part.c, r_sprite.c, r_world.c, sbar.c, sbar.h,
screen.h, snd_dma.c, snd_mem.c, snd_mix.c, sv_main.c, sys_sdl.c, vid.h,
view.h, world.c, world.h: Loads of warning fixes about missing function
prototypes, missing parens around &, missing braces leading to ambiguous
else statements and unused and uninitialized variables. There are still a
couple of unitialised variables here and there, but not much. The warnings
about strict aliasing violations need taking care of.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@21 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-02-16 12:01:07 +00:00
|
|
|
if (!strncmp((char *)data_p + 28, "mark", 4))
|
2010-02-15 23:26:55 +00:00
|
|
|
{ // this is not a proper parse, but it works with cooledit...
|
|
|
|
data_p += 24;
|
2010-12-30 21:10:26 +00:00
|
|
|
i = GetLittleLong(); // samples in loop
|
2010-02-15 23:26:55 +00:00
|
|
|
info.samples = info.loopstart + i;
|
2010-12-30 21:10:26 +00:00
|
|
|
// Con_Printf("looped length: %i\n", i);
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
info.loopstart = -1;
|
|
|
|
|
|
|
|
// find data chunk
|
|
|
|
FindChunk("data");
|
|
|
|
if (!data_p)
|
|
|
|
{
|
2010-12-30 14:39:12 +00:00
|
|
|
Con_Printf("%s is missing data chunk\n", name);
|
2010-02-15 23:26:55 +00:00
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
data_p += 4;
|
2010-12-30 21:10:26 +00:00
|
|
|
samples = GetLittleLong() / info.width;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (info.samples)
|
|
|
|
{
|
|
|
|
if (samples < info.samples)
|
2010-12-30 14:39:12 +00:00
|
|
|
Sys_Error ("%s has a bad loop length", name);
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
info.samples = samples;
|
|
|
|
|
|
|
|
info.dataofs = data_p - wav;
|
|
|
|
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|