Make use of the new sound_sample function arrangement.

diff --git a/src/ATC/ATCVoice.cxx b/src/ATC/ATCVoice.cxx
index 02ef855a51da3c77ddb96d6da7e252847fb2086f..727681631903165a17eed00bf50dc542f89c83e7 100644 (file)
--- a/src/ATC/ATCVoice.cxx
+++ b/src/ATC/ATCVoice.cxx
@@ -54,9 +54,9 @@ bool FGATCVoice::LoadVoice(const string& voice) {
 
         string file = voice + ".wav";
        
-       SoundData = new SGSoundSample( path.c_str(), file.c_str(), false );
+       SoundData = new SGSoundSample();
+        rawSoundData = (char *)SoundData->load_file(path.c_str(), file.c_str());
        rawDataSize = SoundData->get_size();
-       rawSoundData = SoundData->get_data();
        
        path = globals->get_fg_root();
        string wordPath = "ATC/" + voice + ".vce";

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index b3964c2961c987bbc4f5d80c7967465369a3db95..f6c526403a3e310f960ff7862782e0071b35d951 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -65,7 +65,7 @@ void FGClouds::set_update_event(int count) {
 
 void FGClouds::init(void) {
        if( snd_lightning == NULL ) {
-               snd_lightning = new SGSoundSample(globals->get_fg_root().c_str(), "Sounds/thunder.wav", true);
+               snd_lightning = new SGSoundSample(globals->get_fg_root().c_str(), "Sounds/thunder.wav");
                snd_lightning->set_max_dist(7000.0f);
                snd_lightning->set_reference_dist(3000.0f);
                SGSoundMgr *soundMgr = globals->get_soundmgr();