Merge branch 'torsten/metar'

[flightgear.git] / src / ATCDCL / AIPlane.cxx

diff --git a/src/ATCDCL/AIPlane.cxx b/src/ATCDCL/AIPlane.cxx
index 3a46ee051932eb0c06df859d7d623a293205aca4..8fd67d13aeb190b837706c8996e27c339f068b90 100644 (file)
--- a/src/ATCDCL/AIPlane.cxx
+++ b/src/ATCDCL/AIPlane.cxx
@@ -29,8 +29,6 @@ using std::string;
 
 #include "AIPlane.hxx"
 
-SGSampleGroup *FGAIPlane::_sgr = 0;
-
 FGAIPlane::FGAIPlane() {
        leg = LEG_UNKNOWN;
        tuned_station = NULL;
@@ -197,10 +195,10 @@ void FGAIPlane::Render(const string& refname, const float volume, bool repeating
 #ifdef ENABLE_AUDIO_SUPPORT
        voice = (voiceOK && fgGetBool("/sim/sound/voice"));
        if(voice) {
-            sizte_t len;
-           void* buf = vPtr->WriteMessage((char*)pending_transmission.c_str(), voice, &len);
+            size_t len;
+           void* buf = vPtr->WriteMessage(pending_transmission, &len);
            if(voice && (volume > 0.05)) {
-               SGSoundSample* simple = new SGSoundSample(buf, len, 8000 );
+               SGSoundSample* simple = new SGSoundSample(&buf, len, 8000 );
                simple->set_volume(volume);
                _sgr->add(simple, refname);
                _sgr->play(refname, repeating);