#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 ) {
// constructor
FGSoundMgr::FGSoundMgr() {
audio_sched = new slScheduler( 8000 );
+ audio_sched -> setMaxConcurrent ( 6 );
+
audio_mixer = new smMixer;
SG_LOG( SG_GENERAL, SG_INFO,
}
// destructor
+
FGSoundMgr::~FGSoundMgr() {
sound_map_iterator current = sounds.begin();
sound_map_iterator end = sounds.end();
// initialize the sound manager
-bool FGSoundMgr::init() {
+void 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();
}
sounds.clear();
- if ( audio_sched->not_working() ) {
- return false;
- } else {
- return true;
- }
+}
+
+void FGSoundMgr::bind ()
+{
+ // no properties yet
+}
+
+void FGSoundMgr::unbind ()
+{
+ // no properties yet
}
// run the audio scheduler
-bool FGSoundMgr::update() {
+void FGSoundMgr::update(int dt) {
SGTimeStamp current;
current.stamp();
} 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() ) {
+ if ( !audio_sched->not_working() )
audio_sched -> update();
- return true;
- } else {
- return false;
- }
}