jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More sensible defaults

Browse source 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 42
This commit is contained in:
Simon Howard 2005-08-05 17:53:07 +00:00
parent a053707f27
commit d2c5206b14
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/i_sound.c
View file

@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id: i_sound.c 39 2005-08-04 21:48:32Z fraggle $
// $Id: i_sound.c 42 2005-08-05 17:53:07Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
// Revision 1.7 2005/08/05 17:53:07 fraggle
// More sensible defaults
//
// Revision 1.6 2005/08/04 21:48:32 fraggle
// Turn on compiler optimisation and warning options
// Add SDL_mixer sound code
@ -48,7 +51,7 @@
//-----------------------------------------------------------------------------
static const char
rcsid[] = "$Id: i_sound.c 39 2005-08-04 21:48:32Z fraggle $";
rcsid[] = "$Id: i_sound.c 42 2005-08-05 17:53:07Z fraggle $";
#include <stdio.h>
#include <stdlib.h>
@ -78,7 +81,7 @@ static byte *expand_sound_data(byte *data, int samplerate, int length)
if (samplerate == 11025)
{
// need to expand to 2 channels, and expand 8 bit samples to 16 bits
// need to expand to 2 channels, and expand 11025->22050
result = Z_Malloc(length * 4, PU_STATIC, NULL);
@ -94,10 +97,9 @@ static byte *expand_sound_data(byte *data, int samplerate, int length)
result = Z_Malloc(length * 2, PU_STATIC, NULL);
for (i=0; i<length / 2; ++i)
for (i=0; i<length; ++i)
{
result[i * 4] = result[i * 4 + 2] = data[i * 2];
result[i * 4 + 1] = result[i * 4 + 3] = data[i * 2 + 1];
result[i * 2] = result[i * 2 + 1] = data[i];
}
}
else
@ -128,7 +130,7 @@ static Mix_Chunk *getsfx(int sound)
sound_chunks[sound].allocated = 1;
sound_chunks[sound].abuf = expand_sound_data(data + 8, samplerate, length);
sound_chunks[sound].alen = (length * 2 * 22050) / samplerate;
sound_chunks[sound].volume = 128;
sound_chunks[sound].volume = 32;
}
return &sound_chunks[sound];
@ -300,6 +302,8 @@ I_InitSound()
{
printf("Error initialising SDL_mixer: %s\n", SDL_GetError());
}
Mix_AllocateChannels(16);
sound_initialised = 1;