From 679eb0b984c476a8a0f5edff18181a0afa657556 Mon Sep 17 00:00:00 2001 From: curt <curt> Date: Thu, 29 Mar 2001 14:11:43 +0000 Subject: [PATCH] Tweaking sound safety margin. --- src/Sound/soundmgr.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx index 93ff51bed..7a70607bd 100644 --- a/src/Sound/soundmgr.cxx +++ b/src/Sound/soundmgr.cxx @@ -31,6 +31,8 @@ #include "soundmgr.hxx" +#define FG_SOUND_SAFETY_MULT 3 +#define FG_MAX_SOUND_SAFETY ( 1.0 / FG_SOUND_SAFETY_MULT ) // constructor FGSimpleSound::FGSimpleSound( string file ) { @@ -88,10 +90,10 @@ FGSoundMgr::~FGSoundMgr() { // initialize the sound manager bool FGSoundMgr::init() { last.stamp(); - safety = 0.5; + safety = FG_MAX_SOUND_SAFETY; audio_mixer -> setMasterVolume ( 80 ) ; /* 80% of max volume. */ - audio_sched -> setSafetyMargin ( 2 * safety ) ; + audio_sched -> setSafetyMargin ( FG_SOUND_SAFETY_MULT * safety ) ; sound_map_iterator current = sounds.begin(); sound_map_iterator end = sounds.end(); @@ -123,11 +125,11 @@ bool FGSoundMgr::update() { } else { safety = safety * 0.99 + elapsed * 0.01; } - if ( safety > 0.5 ) { - safety = 0.5; + if ( safety > FG_MAX_SOUND_SAFETY ) { + safety = FG_MAX_SOUND_SAFETY; } // cout << "safety = " << safety << endl; - audio_sched -> setSafetyMargin ( 2 * safety ) ; + audio_sched -> setSafetyMargin ( FG_SOUND_SAFETY_MULT * safety ) ; if ( !audio_sched->not_working() ) { audio_sched -> update();