fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sound looping bug fix from eric - https://sourceforge.net/p/quakespasm/patches/12/ 

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@886 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Steven 2014-01-12 02:55:04 +00:00
parent e951f43788
commit ffe32528b9
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Quake/snd_mix.c
View File

@ -158,8 +158,8 @@ CHANNEL MIXING
=============================================================================== ===============================================================================
*/ */
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime); static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int endtime, int paintbufferstart);
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime); static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int endtime, int paintbufferstart);
void S_PaintChannels (int endtime) void S_PaintChannels (int endtime)
{ {
@ -228,10 +228,12 @@ void S_PaintChannels (int endtime)
if (count > 0) if (count > 0)
{ {
// the last param to SND_PaintChannelFrom is the index
// to start painting to in the paintbuffer, usually 0.
if (sc->width == 1) if (sc->width == 1)
SND_PaintChannelFrom8(ch, sc, count); SND_PaintChannelFrom8(ch, sc, count, ltime - paintedtime);
else else
SND_PaintChannelFrom16(ch, sc, count); SND_PaintChannelFrom16(ch, sc, count, ltime - paintedtime);
ltime += count; ltime += count;
} }
@ -282,7 +284,7 @@ void SND_InitScaletable (void)
} }
static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count) static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count, int paintbufferstart)
{ {
int data; int data;
int *lscale, *rscale; int *lscale, *rscale;
@ -301,14 +303,14 @@ static void SND_PaintChannelFrom8 (channel_t *ch, sfxcache_t *sc, int count)
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
data = sfx[i]; data = sfx[i];
paintbuffer[i].left += lscale[data]; paintbuffer[paintbufferstart + i].left += lscale[data];
paintbuffer[i].right += rscale[data]; paintbuffer[paintbufferstart + i].right += rscale[data];
} }
ch->pos += count; ch->pos += count;
} }
static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count) static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count, int paintbufferstart)
{ {
int data; int data;
int left, right; int left, right;
@ -331,8 +333,8 @@ static void SND_PaintChannelFrom16 (channel_t *ch, sfxcache_t *sc, int count)
// right = (data * rightvol) >> 8; // right = (data * rightvol) >> 8;
left = data * leftvol; left = data * leftvol;
right = data * rightvol; right = data * rightvol;
paintbuffer[i].left += left; paintbuffer[paintbufferstart + i].left += left;
paintbuffer[i].right += right; paintbuffer[paintbufferstart + i].right += right;
} }
ch->pos += count; ch->pos += count;