Don't continue parsing after processing version line

[simgear.git] / simgear / sound / openal_test2.cxx

diff --git a/simgear/sound/openal_test2.cxx b/simgear/sound/openal_test2.cxx
index 46a0f621ad640392e0158e9d3ded4d6110d84fd6..43bd464d7708847d7d93dfd0c7d09ff879d256a7 100644 (file)
--- a/simgear/sound/openal_test2.cxx
+++ b/simgear/sound/openal_test2.cxx
@@ -1,16 +1,18 @@
 #include <stdio.h>
-#ifdef __MINGW32__
-// This is broken, but allows the file to compile without a POSIX
-// environment.
-static unsigned int sleep(unsigned int secs) { return 0; }
+#ifdef _WIN32
+#include <windows.h>
+#define sleep(x) Sleep(x*1000)
 #else
-#include <unistd.h>    // sleep()
+#include <unistd.h>
 #endif
 
 #include <simgear/debug/logstream.hxx>
 #include <simgear/misc/sg_path.hxx>
+#include <simgear/timing/timestamp.hxx>
 
 #include "soundmgr_openal.hxx"
+#include "sample_group.hxx"
+#include "sample_openal.hxx"
 
 
 int main( int argc, char *argv[] ) {
@@ -21,10 +23,13 @@ int main( int argc, char *argv[] ) {
 
     smgr->bind();
     smgr->init();
-    smgr->set_volume(0.9);
     sgr = smgr->find("default", true);
+    smgr->set_volume(0.9);
+    smgr->activate();
+
+    SGPath srcDir(SRC_DIR);
 
-    SGSoundSample *sample1 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample1 = new SGSoundSample("jet.wav", srcDir);
     sample1->set_volume(1.0);
     sample1->set_pitch(1.0);
     sample1->play_looped();
@@ -33,7 +38,7 @@ int main( int argc, char *argv[] ) {
     printf("playing sample1\n");
     sleep(1);
 
-    SGSoundSample *sample2 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample2 = new SGSoundSample("jet.wav", srcDir);
     sample2->set_volume(0.5);
     sample2->set_pitch(0.4);
     sample2->play_looped();
@@ -42,7 +47,7 @@ int main( int argc, char *argv[] ) {
     printf("playing sample2\n");
     sleep(1);
 
-    SGSoundSample *sample3 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample3 = new SGSoundSample("jet.wav", srcDir);
     sample3->set_volume(0.5);
     sample3->set_pitch(0.8);
     sample3->play_looped();
@@ -51,7 +56,7 @@ int main( int argc, char *argv[] ) {
     printf("playing sample3\n");
     sleep(1);
 
-    SGSoundSample *sample4 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample4 = new SGSoundSample("jet.wav", srcDir);
     sample4->set_volume(0.5);
     sample4->set_pitch(1.2);
     sample4->play_looped();
@@ -60,7 +65,7 @@ int main( int argc, char *argv[] ) {
     printf("playing sample4\n");
     sleep(1);
 
-    SGSoundSample *sample5 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample5 = new SGSoundSample("jet.wav", srcDir);
     sample5->set_volume(0.5);
     sample5->set_pitch(1.6);
     sample5->play_looped();
@@ -69,7 +74,7 @@ int main( int argc, char *argv[] ) {
     printf("playing sample5\n");
     sleep(1);
 
-    SGSoundSample *sample6 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample6 = new SGSoundSample("jet.wav", srcDir);
     sample6->set_volume(0.5);
     sample6->set_pitch(2.0);
     sample6->play_looped();
@@ -86,12 +91,12 @@ int main( int argc, char *argv[] ) {
     sgr->stop("sound1");
     sgr->stop("sound2");
     sgr->stop("sound3");
-    sleep(0.5);
-    sgr->update(0.5);
+    SGTimeStamp::sleepForMSec(500);
+    smgr->update(0.5);
     sgr->stop("sound4");
     sgr->stop("sound5");
     sgr->stop("sound6");
-    sgr->update(1);
+    smgr->update(1);
     sleep(1);
 
     smgr->unbind();