From: ehofman Date: Sat, 12 Nov 2005 10:27:05 +0000 (+0000) Subject: Make use of the new sound_sample function arrangement. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=e5d3c3134bf0bfd1c49ebc332322e6349e2453d6;p=flightgear.git Make use of the new sound_sample function arrangement. --- diff --git a/src/ATC/ATCVoice.cxx b/src/ATC/ATCVoice.cxx index 02ef855a5..727681631 100644 --- 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 b3964c296..f6c526403 100644 --- 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();