TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

original prototype in d2src is wrong, I guess

Browse source
This commit is contained in:
Bradley Bell 2004-11-29 06:09:06 +00:00
parent 0ecaecaa83
commit b4747b7493
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2004-11-28 Bradley Bell <btb@icculus.org>
* arch/sdl/digi.c, main/digi.h: original prototype in d2src is
wrong, I guess
* arch/sdl/digi.c, arch/win32/midi.c, main/Makefile.am,
main/digiobj.c, main/digi.h, main/kludge.c, main/old/digiobj.c:
ripped object stuff out of digi.c, now using digiobj.c. get rid of

4
arch/sdl/digi.c
View file

@ -1,4 +1,4 @@
/* $Id: digi.c,v 1.18 2004-11-29 05:25:58 btb Exp $ */
/* $Id: digi.c,v 1.19 2004-11-29 06:09:06 btb Exp $ */
/*
*
* SDL digital audio support
@ -253,7 +253,7 @@ static int get_free_slot()
return -1;
}
int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int persistent)
int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int soundobj)
{
int ntries;
int slot;

4
main/digi.h
View file

@ -1,4 +1,4 @@
/* $Id: digi.h,v 1.5 2004-11-29 05:25:58 btb Exp $ */
/* $Id: digi.h,v 1.6 2004-11-29 06:09:06 btb Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -109,7 +109,7 @@ extern void digi_stop_sound( int channel );
extern int digi_find_channel(int soundno);
// Volume 0-F1_0
extern int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int persistent);
extern int digi_start_sound(short soundnum, fix volume, int pan, int looping, int loop_start, int loop_end, int soundobj);
// Stops all sounds that are playing
void digi_stop_all_channels();