Fix up tests for revised SGSoundSample ctor.

diff --git a/simgear/sound/openal_test2.cxx b/simgear/sound/openal_test2.cxx
index eb0da57e5007ccdd98a3b9c361da446156b3ee37..d935b8d7623cdcbc26c562c1adcfa4c28ef374cc 100644 (file)
--- a/simgear/sound/openal_test2.cxx
+++ b/simgear/sound/openal_test2.cxx
@@ -26,7 +26,7 @@ int main( int argc, char *argv[] ) {
     smgr->set_position( SGVec3d::fromGeod(pos), pos );
     smgr->activate();
 
-    SGSoundSample *sample1 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample1 = new SGSoundSample("jet.wav", SRC_DIR);
     sample1->set_volume(1.0);
     sample1->set_pitch(1.0);
     sample1->play_looped();
@@ -35,7 +35,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", SRC_DIR);
     sample2->set_volume(0.5);
     sample2->set_pitch(0.4);
     sample2->play_looped();
@@ -44,7 +44,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", SRC_DIR);
     sample3->set_volume(0.5);
     sample3->set_pitch(0.8);
     sample3->play_looped();
@@ -53,7 +53,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", SRC_DIR);
     sample4->set_volume(0.5);
     sample4->set_pitch(1.2);
     sample4->play_looped();
@@ -62,7 +62,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", SRC_DIR);
     sample5->set_volume(0.5);
     sample5->set_pitch(1.6);
     sample5->play_looped();
@@ -71,7 +71,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", SRC_DIR);
     sample6->set_volume(0.5);
     sample6->set_pitch(2.0);
     sample6->play_looped();

diff --git a/simgear/sound/openal_test3.cxx b/simgear/sound/openal_test3.cxx
index 96a57a0460a9814eb26725d92be4391ca53240f1..70260289a38f3b60f3495c2b6ae55088c41e81fa 100644 (file)
--- a/simgear/sound/openal_test3.cxx
+++ b/simgear/sound/openal_test3.cxx
@@ -26,7 +26,7 @@ int main( int argc, char *argv[] ) {
     smgr->activate();
 
     printf("default position and orientation\n");
-    SGSoundSample *sample1 = new SGSoundSample( SRC_DIR, "jet.wav" );
+    SGSoundSample *sample1 = new SGSoundSample("jet.wav", SRC_DIR);
     sample1->set_volume(1.0);
     sample1->set_pitch(1.0);
     sample1->play_looped();