fly/flightgear
1
0
Fork 0
Code Activity

Check if audio "working()" before doing audio manipulations.

Browse source
This commit is contained in:
curt 1998-09-26 13:18:35 +00:00
parent 33a585042c
commit 6b2447c6c4
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Main/GLUTmain.cxx
View file

@ -572,7 +572,7 @@ static void fgMainLoop( void ) {
// Run audio scheduler // Run audio scheduler
#ifdef ENABLE_AUDIO_SUPPORT #ifdef ENABLE_AUDIO_SUPPORT
if ( current_options.get_sound() ) { if ( current_options.get_sound() && !audio_sched->not_working() ) {
double param = c->throttle[0] * 2.0 + 1.0; double param = c->throttle[0] * 2.0 + 1.0;
pitch_envelope.setStep ( 0, 0.01, param ); pitch_envelope.setStep ( 0, 0.01, param );
@ -694,6 +694,7 @@ static void fgIdleFunction ( void ) {
s1 -> getRate(), s1 -> getBps(), s1 -> getStereo()); s1 -> getRate(), s1 -> getBps(), s1 -> getStereo());
audio_sched -> loopSample ( s1 ); audio_sched -> loopSample ( s1 );
if ( !audio_sched->not_working() ) {
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 );
@ -703,6 +704,7 @@ static void fgIdleFunction ( void ) {
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); // strcpy(slfile, path);
// strcat(slfile, "thunder.wav"); // strcat(slfile, "thunder.wav");
@ -888,6 +890,9 @@ int main( int argc, char **argv ) {
// $Log$ // $Log$
// Revision 1.53 1998/09/26 13:18:35 curt
// Check if audio "working()" before doing audio manipulations.
//
// Revision 1.52 1998/09/25 16:02:07 curt // Revision 1.52 1998/09/25 16:02:07 curt
// Added support for pitch and volume envelopes and tied them to the // Added support for pitch and volume envelopes and tied them to the
// throttle setting. // throttle setting.