From 9a7bbf3db53f484f914bb354ea89048b96843c58 Mon Sep 17 00:00:00 2001
From: ehofman <ehofman>
Date: Sat, 12 Nov 2005 12:31:11 +0000
Subject: [PATCH] Sync with SimGear.

---
 src/ATC/AIPlane.cxx  | 2 +-
 src/ATC/ATC.cxx      | 2 +-
 src/Sound/beacon.cxx | 7 +++----
 src/Sound/morse.cxx  | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/ATC/AIPlane.cxx b/src/ATC/AIPlane.cxx
index 8d501910d..a20bffcb3 100644
--- a/src/ATC/AIPlane.cxx
+++ b/src/ATC/AIPlane.cxx
@@ -188,7 +188,7 @@ void FGAIPlane::Render(const string& refname, bool repeating) {
 		int len;
 		unsigned char* buf = vPtr->WriteMessage((char*)pending_transmission.c_str(), len, voice);
 		if(voice) {
-			SGSoundSample* simple = new SGSoundSample(buf, len, 8000, false);
+			SGSoundSample* simple = new SGSoundSample(buf, len, 8000);
 			// TODO - at the moment the volume is always set off comm1 
 			// and can't be changed after the transmission has started.
 			simple->set_volume(5.0 * fgGetDouble("/instrumentation/comm[0]/volume"));
diff --git a/src/ATC/ATC.cxx b/src/ATC/ATC.cxx
index 55a9dc814..fe20322b1 100644
--- a/src/ATC/ATC.cxx
+++ b/src/ATC/ATC.cxx
@@ -227,7 +227,7 @@ void FGATC::Render(string& msg, const string& refname, bool repeating) {
 		unsigned char* buf = _vPtr->WriteMessage((char*)msg.c_str(), len, _voice);
 		if(_voice) {
 			SGSoundSample *simple
-                            = new SGSoundSample(buf, len, 8000, false);
+                            = new SGSoundSample(buf, len, 8000);
 			// TODO - at the moment the volume is always set off comm1 
 			// and can't be changed after the transmission has started.
 			simple->set_volume(5.0 * fgGetDouble("/instrumentation/comm[0]/volume"));
diff --git a/src/Sound/beacon.cxx b/src/Sound/beacon.cxx
index 2a3ba6439..ddc8750b0 100644
--- a/src/Sound/beacon.cxx
+++ b/src/Sound/beacon.cxx
@@ -62,7 +62,7 @@ bool FGBeacon::init() {
 	ptr += INNER_DIT_LEN;
     }
 
-    inner = new SGSoundSample( inner_buf, INNER_SIZE, BYTES_PER_SECOND, false );
+    inner = new SGSoundSample( inner_buf, INNER_SIZE, BYTES_PER_SECOND );
     inner->set_reference_dist( 10.0 );
     inner->set_max_dist( 20.0 );
 
@@ -82,8 +82,7 @@ bool FGBeacon::init() {
     ptr += MIDDLE_DIT_LEN;
     memcpy( ptr, middle_dah, MIDDLE_DAH_LEN );
 
-    middle = new SGSoundSample( middle_buf, MIDDLE_SIZE, BYTES_PER_SECOND,
-                                false );
+    middle = new SGSoundSample( middle_buf, MIDDLE_SIZE, BYTES_PER_SECOND );
     middle->set_reference_dist( 10.0 );
     middle->set_max_dist( 20.0 );
 
@@ -98,7 +97,7 @@ bool FGBeacon::init() {
     ptr += OUTER_DAH_LEN;
     memcpy( ptr, outer_dah, OUTER_DAH_LEN );
 
-    outer = new SGSoundSample( outer_buf, OUTER_SIZE, BYTES_PER_SECOND, false );
+    outer = new SGSoundSample( outer_buf, OUTER_SIZE, BYTES_PER_SECOND);
     outer->set_reference_dist( 10.0 );
     outer->set_max_dist( 20.0 );
 
diff --git a/src/Sound/morse.cxx b/src/Sound/morse.cxx
index f018334e2..855d7b265 100644
--- a/src/Sound/morse.cxx
+++ b/src/Sound/morse.cxx
@@ -261,8 +261,7 @@ SGSoundSample *FGMorse::make_ident( const string& id, const int freq ) {
 
     // 4. create the simple sound and return
     SGSoundSample *sample = new SGSoundSample( buffer, length,
-                                               BYTES_PER_SECOND,
-                                               false );
+                                               BYTES_PER_SECOND );
 
     // clean up the buffer
     delete [] buffer;