Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove SoundSampleSize and SoundFrequency defines

Browse source
This commit is contained in:
nehalmistry 2004-06-10 20:01:06 +00:00
parent 65ea254863
commit 5ae220059d
1 changed files with 2 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/sound/sound_server.cpp
View file

@ -67,12 +67,7 @@
-- Defines -- Defines
----------------------------------------------------------------------------*/ ----------------------------------------------------------------------------*/
//#define SoundSampleSize 8 /// sample size of dsp in bit #define SoundDeviceName "/dev/dsp" /// dsp device
#define SoundSampleSize 16 // sample size of dsp in bit
#define SoundFrequency 44100 // sample rate of dsp
//#define SoundFrequency 22050 // sample rate of dsp
//#define SoundFrequency 11025 /// sample rate of dsp
#define SoundDeviceName "/dev/dsp" /// dsp device
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
-- Variables -- Variables
@ -612,32 +607,6 @@ static int MixChannelsToStereo32(int* buffer,int size)
return new_free_channels; return new_free_channels;
} }
#if SoundSampleSize == 8
/**
** Clip mix to output stereo 8 unsigned bit.
**
** @param mix signed 32 bit input.
** @param size number of samples in input.
** @param output clipped 8 unsigned bit output buffer.
*/
static void ClipMixToStereo8(const int* mix, int size, unsigned char* output)
{
int s;
while (size--) {
s = (*mix++) / 256;
if (s > 127) {
*output++ = 255;
} else if (s < -127) {
*output++ = 0;
} else {
*output++ = s + 127;
}
}
}
#endif
#if SoundSampleSize == 16
/** /**
** Clip mix to output stereo 16 signed bit. ** Clip mix to output stereo 16 signed bit.
** **
@ -662,7 +631,6 @@ static void ClipMixToStereo16(const int* mix, int size, short* output)
} }
} }
} }
#endif
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
-- Other -- Other
@ -832,12 +800,7 @@ void MixIntoBuffer(void* buffer, int samples)
// Add music to mixer buffer // Add music to mixer buffer
MixMusicToStereo32(mixer_buffer, samples); MixMusicToStereo32(mixer_buffer, samples);
#if SoundSampleSize == 8
ClipMixToStereo8(mixer_buffer, samples, buffer);
#endif
#if SoundSampleSize == 16
ClipMixToStereo16(mixer_buffer, samples, buffer); ClipMixToStereo16(mixer_buffer, samples, buffer);
#endif
} }
/** /**
@ -851,9 +814,7 @@ void MixIntoBuffer(void* buffer, int samples)
*/ */
void FillAudio(void* udata __attribute__((unused)), Uint8* stream, int len) void FillAudio(void* udata __attribute__((unused)), Uint8* stream, int len)
{ {
#if SoundSampleSize == 16
len >>= 1; len >>= 1;
#endif
MixIntoBuffer(stream, len); MixIntoBuffer(stream, len);
} }
@ -870,7 +831,7 @@ int InitSound(void)
// //
// Open sound device, 8bit samples, stereo. // Open sound device, 8bit samples, stereo.
// //
if (InitSdlSound(SoundDeviceName, SoundFrequency, SoundSampleSize, if (InitSdlSound(SoundDeviceName, 44100, 16,
WaitForSoundDevice)) { WaitForSoundDevice)) {
return 1; return 1;
} }