A bit of fiddling with audio ...

diff --git a/Main/GLUTmain.cxx b/Main/GLUTmain.cxx
index 0536ecec0abfa82f23735727fc36acfd73147400..87d2c2810bd0800629de1e4b9b442550eb678ec6 100644 (file)
--- a/Main/GLUTmain.cxx
+++ b/Main/GLUTmain.cxx
@@ -89,8 +89,8 @@ int displayInstruments;
 #ifdef HAVE_OSS_AUDIO
 slScheduler audio_sched ( 8000 ) ;
 smMixer audio_mixer ;
-slSample s1;
-slSample s2;
+slSample *s1;
+slSample *s2;
 #endif
 
 
@@ -714,17 +714,16 @@ int main( int argc, char **argv ) {
 
     strcpy(slfile, path);
     strcat(slfile, "prpidle.wav");
-    // s1 . loadFile ( slfile );
-    s1 . loadFile ( slfile );
+    s1 = new slSample ( slfile );
     printf("Rate = %d  Bps = %d  Stereo = %d\n", 
-          s1.getRate(), s1.getBps(), s1.getStereo());
-    audio_sched . playSample ( &s1 );
-
-    strcpy(slfile, path);
-    strcat(slfile, "thunder.wav");
-    // s2 . loadFile ( slfile );
-    // s2 . adjustVolume(0.5);
-    // audio_sched . playSample ( &s2 );
+          s1 -> getRate(), s1 -> getBps(), s1 -> getStereo());
+    audio_sched . playSample ( s1 );
+
+    // strcpy(slfile, path);
+    // strcat(slfile, "thunder.wav");
+    // s2 -> loadFile ( slfile );
+    // s2 -> adjustVolume(0.5);
+    // audio_sched -> playSample ( s2 );
 #endif
 
     // 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$
+// 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
 // Tweaking sound library usage.
 //

diff --git a/Main/Makefile.am b/Main/Makefile.am
index 32f57745bc76e9428801fc5157a665fbc8daa7f1..76f240f8d777dd29dc915db49906cf42e2d79f56 100644 (file)
--- a/Main/Makefile.am
+++ b/Main/Makefile.am
@@ -1,9 +1,6 @@
 if HAVE_OSS_AUDIO
-AUDIO_DEFS = -DHAVE_OSS_AUDIO
+DEFS += -DHAVE_OSS_AUDIO
 AUDIO_LIBS = $(top_builddir)/Lib/Audio/libAudio.la
-else
-AUDIO_DEFS = 
-AUDIO_LIBS = 
 endif
 
 EXTRA_DIST = runfg.in runfg.bat.in
@@ -40,8 +37,6 @@ fg_LDADD = \
        $(top_builddir)/Lib/Debug/libDebug.la \
        $(top_builddir)/Lib/zlib/libz.la
 
-DEFS += $(AUDIO_DEFS)
-
 INCLUDES += \
        -I$(top_builddir) \
        -I$(top_builddir)/Lib \