This is step "1" of probably "many" in the process of separating out the

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

diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index 0580ae588da0680b891f47965fc3f272ed8fa1bc..b303a11cdcfe8acf06b38fd16d24df29969c31d7 100644 (file)
--- a/src/Sound/soundmgr.cxx
+++ b/src/Sound/soundmgr.cxx
@@ -40,9 +40,8 @@
 
 // constructor
 FGSimpleSound::FGSimpleSound( string file )
-  : requests(0),
-    volume(1.0),
-    pitch(1.0)
+  : pitch(1.0),
+    volume(1.0)
 {
     SGPath slfile( globals->get_fg_root() );
     slfile.append( file );
@@ -54,9 +53,8 @@ FGSimpleSound::FGSimpleSound( string file )
 }
 
 FGSimpleSound::FGSimpleSound( unsigned char *buffer, int len )
-  : requests(0),
-    volume(1.0),
-    pitch(1.0)
+  : pitch(1.0),
+    volume(1.0)
 {
     sample = new slSample ( buffer, len );
     pitch_envelope = new slEnvelope( 1, SL_SAMPLE_ONE_SHOT );
@@ -74,15 +72,17 @@ FGSimpleSound::~FGSimpleSound() {
 
 void FGSimpleSound::play( slScheduler *sched, bool looped ) {
     
-    requests++;
-    if (requests > 1)
-       return;
-
-    // sched->stopSample(sample);
-    if (looped)
-       sched->loopSample(sample);
-    else
-       sched->playSample(sample);
+    // make sure sound isn't already playing
+    if ( sample->getPlayCount() > 0 ) {
+       sched->stopSample(sample);
+    //   return;
+    }
+
+    if ( looped ) {
+        sched->loopSample(sample);
+    } else {
+        sched->playSample(sample);
+    }
     
     sched->addSampleEnvelope(sample, 0, 0, pitch_envelope, SL_PITCH_ENVELOPE);
     sched->addSampleEnvelope(sample, 0, 1, volume_envelope, SL_VOLUME_ENVELOPE);
@@ -90,15 +90,6 @@ void FGSimpleSound::play( slScheduler *sched, bool looped ) {
 
 void FGSimpleSound::stop( slScheduler *sched, bool quick ) {
 
-    if (quick)
-       requests = 0;
-    else
-       if (--requests < 0)
-          requests = 0;
-
-    if (requests > 0)
-       return;
-
     sched->stopSample( sample );
 }
 
@@ -134,6 +125,8 @@ FGSoundMgr::~FGSoundMgr() {
     sample_map_iterator sample_end = samples.end();
     for ( ; sample_current != sample_end; ++sample_current ) {
        sample_ref *sr = sample_current->second;
+
+        audio_sched->stopSample(sr->sample);
        delete sr->sample;
        delete sr;
     }
@@ -145,6 +138,9 @@ FGSoundMgr::~FGSoundMgr() {
     sound_map_iterator sound_end = sounds.end();
     for ( ; sound_current != sound_end; ++sound_current ) {
         FGSimpleSound *s = sound_current->second;
+
+        audio_sched->stopSample(s->get_sample());
+        delete s->get_sample();
         delete s;
     }
 
@@ -155,7 +151,6 @@ FGSoundMgr::~FGSoundMgr() {
 
 // initialize the sound manager
 void FGSoundMgr::init() {
-    last.stamp();
     safety = FG_MAX_SOUND_SAFETY;
 
     // audio_mixer -> setMasterVolume ( 80 ) ;  /* 80% of max volume. */
@@ -169,6 +164,8 @@ void FGSoundMgr::init() {
     sample_map_iterator sample_end = samples.end();
     for ( ; sample_current != sample_end; ++sample_current ) {
         sample_ref *sr = sample_current->second;
+
+        audio_sched->stopSample(sr->sample);
         delete sr->sample;
         delete sr;
     }
@@ -181,6 +178,8 @@ void FGSoundMgr::init() {
     sound_map_iterator sound_end = sounds.end();
     for ( ; sound_current != sound_end; ++sound_current ) {
        FGSimpleSound *s = sound_current->second;
+
+        audio_sched->stopSample(s->get_sample());
        delete s->get_sample();
        delete s;
     }
@@ -188,11 +187,13 @@ void FGSoundMgr::init() {
 
 }
 
+
 void FGSoundMgr::bind ()
 {
   // no properties yet
 }
 
+
 void FGSoundMgr::unbind ()
 {
   // no properties yet
@@ -200,17 +201,11 @@ void FGSoundMgr::unbind ()
 
 
 // run the audio scheduler
-void FGSoundMgr::update(int dt) {
-    SGTimeStamp current;
-    current.stamp();
-
-    double elapsed = (double)(current - last) / 1000000.0;
-    last = current;
-
-    if ( elapsed > safety ) {
-       safety = elapsed;
+void FGSoundMgr::update( double dt ) {
+    if ( dt > safety ) {
+       safety = dt;
     } else {
-       safety = safety * 0.99 + elapsed * 0.01;
+       safety = safety * 0.99 + dt * 0.01;
     }
     if ( safety > FG_MAX_SOUND_SAFETY ) {
        safety = FG_MAX_SOUND_SAFETY;
@@ -223,12 +218,35 @@ void FGSoundMgr::update(int dt) {
 }
 
 
+void
+FGSoundMgr::pause ()
+{
+  audio_sched->pauseSample(0, 0);
+}
+
+
+void
+FGSoundMgr::resume ()
+{
+  audio_sched->resumeSample(0, 0);
+}
+
+
 // add a sound effect, return true if successful
 bool FGSoundMgr::add( FGSimpleSound *sound, const string& refname ) {
 
-    sample_map_iterator it = samples.find(refname);
-    if (it != samples.end())
-       return false;
+    sound_map_iterator sound_it = sounds.find( refname );
+    if ( sound_it != sounds.end() ) {
+        // sound already exists
+        return false;
+    }
+
+    sample_map_iterator sample_it = samples.find( refname );
+    if ( sample_it != samples.end() ) {
+        // this sound has existed in the past and it's sample is still
+        // here, delete the sample so we can replace it.
+        samples.erase( sample_it );
+    }
 
     sample_ref *sr = new sample_ref;
 
@@ -241,11 +259,12 @@ bool FGSoundMgr::add( FGSimpleSound *sound, const string& refname ) {
     return true;
 }
 
+
 // add a sound from a file, return the sample if successful, else return NULL
 FGSimpleSound *FGSoundMgr::add( const string& refname, const string &file ) {
      FGSimpleSound *sound;
 
-    if (file == (string)"")
+    if (file.empty())
        return NULL;
 
     sample_map_iterator it = samples.find(file);
@@ -272,6 +291,7 @@ FGSimpleSound *FGSoundMgr::add( const string& refname, const string &file ) {
     return sound;
 }
 
+
 // remove a sound effect, return true if successful
 bool FGSoundMgr::remove( const string& refname ) {
 
@@ -306,9 +326,11 @@ bool FGSoundMgr::remove( const string& refname ) {
        // delete sample;
         sounds.erase( it );
 
+        // cout << "sndmgr: removed -> " << refname << endl;
        return true;
-   } else {
-       return false;
+    } else {
+        // cout << "sndmgr: failed remove -> " << refname << endl;
+        return false;
     }
 }
 
@@ -330,7 +352,7 @@ FGSimpleSound *FGSoundMgr::find( const string& refname ) {
     sound_map_iterator it = sounds.find( refname );
     if ( it != sounds.end() ) {
        return it->second;
-   } else {
+    } else {
        return NULL;
     }
 }
@@ -368,7 +390,7 @@ bool FGSoundMgr::is_playing( const string& refname ) {
     if ((sample = find( refname )) == NULL)
        return false;
 
-    return sample->is_playing();
+    return (sample->get_sample()->getPlayCount() > 0 );
 }