- don't set computer sound volume -- that's up to the user

[flightgear.git] / src / Sound / soundmgr.cxx

diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index b0154535de30867d1a72ef12f0c89604b932649c..76f041bec9209d0336742e020476b22f93b726a2 100644 (file)
--- 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 ) {
@@ -62,6 +64,8 @@ FGSimpleSound::~FGSimpleSound() {
 // constructor
 FGSoundMgr::FGSoundMgr() {
     audio_sched = new slScheduler( 8000 );
+    audio_sched -> setMaxConcurrent ( 6 ); 
+
     audio_mixer = new smMixer;
 
     SG_LOG( SG_GENERAL, SG_INFO,
@@ -88,10 +92,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_mixer -> setMasterVolume ( 80 ) ;  /* 80% of max volume. */
+    audio_sched -> setSafetyMargin ( FG_SOUND_SAFETY_MULT * safety ) ;
 
     sound_map_iterator current = sounds.begin();
     sound_map_iterator end = sounds.end();
@@ -123,11 +127,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 ) ;
+    // cout << "safety = " << safety << endl;
+    audio_sched -> setSafetyMargin ( FG_SOUND_SAFETY_MULT * safety ) ;
 
     if ( !audio_sched->not_working() ) {
        audio_sched -> update();