*** empty log message ***

diff --git a/simgear/sound/Makefile.am b/simgear/sound/Makefile.am
index 86aeebea329d917ee1766fa73056f7634ef945e9..684303f1964cc15a499fe81a8ed23beedf1cae44 100644 (file)
--- a/simgear/sound/Makefile.am
+++ b/simgear/sound/Makefile.am
@@ -32,4 +32,4 @@ openal_test2_LDADD = \
        $(top_builddir)/simgear/structure/libsgstructure.a \
        $(openal_LIBS)
 
-INCLUDES = -I$(top_srcdir)
+INCLUDES = -I$(top_srcdir) -DSRC_DIR=\"$(top_srcdir)/simgear/sound\"

diff --git a/simgear/sound/openal_test1.cxx b/simgear/sound/openal_test1.cxx
index 25d551adfef54b04ae9bfc0dad1bae844756c49c..68b01a50609f15e9af602aaf2503604e29eaf5c2 100644 (file)
--- a/simgear/sound/openal_test1.cxx
+++ b/simgear/sound/openal_test1.cxx
@@ -20,6 +20,8 @@ static unsigned int sleep(unsigned int secs) { return 0; }
 # include <AL/alut.h>
 #endif
 
+#define AUDIOFILE      SRC_DIR"/jet.wav"
+
 #include <simgear/debug/logstream.hxx>
 
 static void print_openal_error( ALuint error ) {
@@ -117,16 +119,16 @@ int main( int argc, char *argv[] ) {
     // Load the sample file
 #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
 
-  buffer = alutCreateBufferFromFile("jet.wav");
+  buffer = alutCreateBufferFromFile(AUDIOFILE);
   if (buffer == AL_NONE) {
     SG_LOG( SG_GENERAL, SG_ALERT, "Failed to buffer data.");
   }
 
 #else
 # if defined (__APPLE__)
-    alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq );
+    alutLoadWAVFile( (ALbyte *)AUDIOFILE, &format, &data, &size, &freq );
 # else
-    alutLoadWAVFile( (ALbyte *)"jet.wav", &format, &data, &size, &freq, &loop );
+    alutLoadWAVFile( (ALbyte *)AUDIOFILE, &format, &data, &size, &freq, &loop );
 # endif
     if (alGetError() != AL_NO_ERROR) {
         SG_LOG( SG_GENERAL, SG_ALERT, "Failed to load wav file.");

diff --git a/simgear/sound/openal_test2.cxx b/simgear/sound/openal_test2.cxx
index f887769c7fa2a9fe02b7b37d01f48e7c7ca1705d..da263620822fedeb0842ad0629faf6c464d8eae8 100644 (file)
--- a/simgear/sound/openal_test2.cxx
+++ b/simgear/sound/openal_test2.cxx
@@ -14,37 +14,37 @@ static unsigned int sleep(unsigned int secs) { return 0; }
 int main( int argc, char *argv[] ) {
     SGSoundMgr sm;
 
-    SGSoundSample sample1( ".", "jet.wav" );
+    SGSoundSample sample1( SRC_DIR, "jet.wav" );
     sample1.set_volume(0.5);
     sample1.set_volume(0.2);
     sample1.play_looped();
     sleep(1);
 
-    SGSoundSample sample2( ".", "jet.wav" );
+    SGSoundSample sample2( SRC_DIR, "jet.wav" );
     sample2.set_volume(0.5);
     sample2.set_pitch(0.4);
     sample2.play_looped();
     sleep(1);
 
-    SGSoundSample sample3( ".", "jet.wav" );
+    SGSoundSample sample3( SRC_DIR, "jet.wav" );
     sample3.set_volume(0.5);
     sample3.set_pitch(0.8);
     sample3.play_looped();
     sleep(1);
 
-    SGSoundSample sample4( ".", "jet.wav" );
+    SGSoundSample sample4( SRC_DIR, "jet.wav" );
     sample4.set_volume(0.5);
     sample4.set_pitch(1.2);
     sample4.play_looped();
     sleep(1);
 
-    SGSoundSample sample5( ".", "jet.wav" );
+    SGSoundSample sample5( SRC_DIR, "jet.wav" );
     sample5.set_volume(0.5);
     sample5.set_pitch(1.6);
     sample5.play_looped();
     sleep(1);
 
-    SGSoundSample sample6( ".", "jet.wav" );
+    SGSoundSample sample6( SRC_DIR, "jet.wav" );
     sample6.set_volume(0.5);
     sample6.set_pitch(2.0);
     sample6.play_looped();