Major overhaul:

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

diff --git a/src/Sound/soundmgr.cxx b/src/Sound/soundmgr.cxx
index edd46700d4fa4a05b80148f6aa55b757a31b4eda..2b7e25576c4dee1eb1686c4fe3eb14c3d7f2cfad 100644 (file)
--- a/src/Sound/soundmgr.cxx
+++ b/src/Sound/soundmgr.cxx
@@ -41,8 +41,7 @@
 // constructor
 FGSimpleSound::FGSimpleSound( string file )
   : pitch(1.0),
-    volume(1.0),
-    requests(0)
+    volume(1.0)
 {
     SGPath slfile( globals->get_fg_root() );
     slfile.append( file );
@@ -55,8 +54,7 @@ FGSimpleSound::FGSimpleSound( string file )
 
 FGSimpleSound::FGSimpleSound( unsigned char *buffer, int len )
   : pitch(1.0),
-    volume(1.0),
-    requests(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 );
 }
 
@@ -200,7 +191,8 @@ void FGSoundMgr::unbind ()
 
 
 // run the audio scheduler
-void FGSoundMgr::update(int dt) {
+void FGSoundMgr::update(double dt) {
+                               // FIXME: use dt supplied (seconds)
     SGTimeStamp current;
     current.stamp();
 
@@ -223,12 +215,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,6 +256,7 @@ 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;
@@ -272,6 +288,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 +323,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 +349,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 +387,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 );
 }