dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r19332) -Codechange: Simplify sound panning by using float data, and switch to sinusoidal algorithm to maintain output level.

Browse Source
This commit is contained in:
peter1138
2010-03-06 11:08:31 +00:00
parent e6f148119d
commit 70fb7e4549
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mixer.cpp
View File

@@ -10,6 +10,7 @@
/** @file mixer.cpp Mixing of sound samples. */
#include "stdafx.h"
#include <math.h>
#include "core/math_func.hpp"
struct MixerChannel {
@@ -185,10 +186,18 @@ void MxSetChannelRawSrc(MixerChannel *mc, int8 *mem, size_t size, uint rate, boo
mc->is16bit = is16bit;
}
void MxSetChannelVolume(MixerChannel *mc, uint left, uint right)
/**
* Set volume and pan parameters for a sound.
* @param mc MixerChannel to set
* @param volume Volume level for sound, range is 0..16384
* @param pan Pan position for sound, range is 0..1
*/
void MxSetChannelVolume(MixerChannel *mc, uint volume, float pan)
{
mc->volume_left = left;
mc->volume_right = right;
/* Use sinusoidal pan to maintain overall sound power level regardless
* of position. */
mc->volume_left = volume * sin((1.0 - pan) * M_PI / 2.0);
mc->volume_right = volume * sin(pan * M_PI / 2.0);
}