fly/flightgear
1
0
Fork 0
Code Activity

Do a better job of disabling all sound related stuff if --disable-sound is

Browse source 
specified.
This commit is contained in:
curt 1999-11-20 15:39:53 +00:00
parent 65e9aba6dc
commit 60ac2b36e0
1 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
src/Main/main.cxx
View file

@ -990,40 +990,42 @@ static void fgIdleFunction ( void ) {
} }
#endif // WIN32 #endif // WIN32
audio_sched = new slScheduler ( 8000 ); if ( current_options.get_sound() ) {
audio_mixer = new smMixer; audio_sched = new slScheduler ( 8000 );
audio_mixer -> setMasterVolume ( 80 ) ; /* 80% of max volume. */ audio_mixer = new smMixer;
audio_sched -> setSafetyMargin ( 1.0 ) ; audio_mixer -> setMasterVolume ( 80 ) ; /* 80% of max volume. */
audio_sched -> setSafetyMargin ( 1.0 ) ;
FGPath slfile( current_options.get_fg_root() ); FGPath slfile( current_options.get_fg_root() );
slfile.append( "Sounds/wasp.wav" ); slfile.append( "Sounds/wasp.wav" );
s1 = new slSample ( (char *)slfile.c_str() ); s1 = new slSample ( (char *)slfile.c_str() );
FG_LOG( FG_GENERAL, FG_INFO, FG_LOG( FG_GENERAL, FG_INFO,
"Rate = " << s1 -> getRate() "Rate = " << s1 -> getRate()
<< " Bps = " << s1 -> getBps() << " Bps = " << s1 -> getBps()
<< " Stereo = " << s1 -> getStereo() ); << " Stereo = " << s1 -> getStereo() );
audio_sched -> loopSample ( s1 ); audio_sched -> loopSample ( s1 );
if ( audio_sched->not_working() ) { if ( audio_sched->not_working() ) {
// skip // skip
} else { } else {
pitch_envelope.setStep ( 0, 0.01, 0.6 ); pitch_envelope.setStep ( 0, 0.01, 0.6 );
volume_envelope.setStep ( 0, 0.01, 0.6 ); volume_envelope.setStep ( 0, 0.01, 0.6 );
audio_sched -> addSampleEnvelope( s1, 0, 0, audio_sched -> addSampleEnvelope( s1, 0, 0,
&pitch_envelope, &pitch_envelope,
SL_PITCH_ENVELOPE ); SL_PITCH_ENVELOPE );
audio_sched -> addSampleEnvelope( s1, 0, 1, audio_sched -> addSampleEnvelope( s1, 0, 1,
&volume_envelope, &volume_envelope,
SL_VOLUME_ENVELOPE ); SL_VOLUME_ENVELOPE );
}
// strcpy(slfile, path);
// strcat(slfile, "thunder.wav");
// s2 -> loadFile ( slfile );
// s2 -> adjustVolume(0.5);
// audio_sched -> playSample ( s2 );
} }
// strcpy(slfile, path);
// strcat(slfile, "thunder.wav");
// s2 -> loadFile ( slfile );
// s2 -> adjustVolume(0.5);
// audio_sched -> playSample ( s2 );
#endif #endif
// sleep(1); // sleep(1);