fly/flightgear
1
0
Fork 0
Code Activity

A bit of fiddling with audio ...

Browse source
This commit is contained in:
curt 1998-06-05 18:18:40 +00:00
parent 274ba49906
commit c8a5e3ebb6
2 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Main/GLUTmain.cxx
View file

@ -89,8 +89,8 @@ int displayInstruments;
#ifdef HAVE_OSS_AUDIO #ifdef HAVE_OSS_AUDIO
slScheduler audio_sched ( 8000 ) ; slScheduler audio_sched ( 8000 ) ;
smMixer audio_mixer ; smMixer audio_mixer ;
slSample s1; slSample *s1;
slSample s2; slSample *s2;
#endif #endif
@ -714,17 +714,16 @@ int main( int argc, char **argv ) {
strcpy(slfile, path); strcpy(slfile, path);
strcat(slfile, "prpidle.wav"); strcat(slfile, "prpidle.wav");
// s1 . loadFile ( slfile ); s1 = new slSample ( slfile );
s1 . loadFile ( slfile );
printf("Rate = %d Bps = %d Stereo = %d\n", printf("Rate = %d Bps = %d Stereo = %d\n",
s1.getRate(), s1.getBps(), s1.getStereo()); s1 -> getRate(), s1 -> getBps(), s1 -> getStereo());
audio_sched . playSample ( &s1 ); audio_sched . playSample ( s1 );
strcpy(slfile, path); // strcpy(slfile, path);
strcat(slfile, "thunder.wav"); // strcat(slfile, "thunder.wav");
// s2 . loadFile ( slfile ); // s2 -> loadFile ( slfile );
// s2 . adjustVolume(0.5); // s2 -> adjustVolume(0.5);
// audio_sched . playSample ( &s2 ); // audio_sched -> playSample ( s2 );
#endif #endif
// pass control off to the master GLUT event handler // pass control off to the master GLUT event handler
@ -735,15 +734,10 @@ int main( int argc, char **argv ) {
} }
#ifdef __SUNPRO_CC
extern "C" {
void __eprintf( void ) {
}
}
#endif
// $Log$ // $Log$
// Revision 1.22 1998/06/05 18:18:40 curt
// A bit of fiddling with audio ...
//
// Revision 1.21 1998/06/03 22:01:06 curt // Revision 1.21 1998/06/03 22:01:06 curt
// Tweaking sound library usage. // Tweaking sound library usage.
// //

7
Main/Makefile.am
View file

@ -1,9 +1,6 @@
if HAVE_OSS_AUDIO if HAVE_OSS_AUDIO
AUDIO_DEFS = -DHAVE_OSS_AUDIO DEFS += -DHAVE_OSS_AUDIO
AUDIO_LIBS = $(top_builddir)/Lib/Audio/libAudio.la AUDIO_LIBS = $(top_builddir)/Lib/Audio/libAudio.la
else
AUDIO_DEFS =
AUDIO_LIBS =
endif endif
EXTRA_DIST = runfg.in runfg.bat.in EXTRA_DIST = runfg.in runfg.bat.in
@ -40,8 +37,6 @@ fg_LDADD = \
$(top_builddir)/Lib/Debug/libDebug.la \ $(top_builddir)/Lib/Debug/libDebug.la \
$(top_builddir)/Lib/zlib/libz.la $(top_builddir)/Lib/zlib/libz.la
DEFS += $(AUDIO_DEFS)
INCLUDES += \ INCLUDES += \
-I$(top_builddir) \ -I$(top_builddir) \
-I$(top_builddir)/Lib \ -I$(top_builddir)/Lib \