Fix Linux compile: "free" needs stdlib.h.

Also move to .cxx file to avoid another include dependency in the header.

diff --git a/simgear/sound/sample_openal.cxx b/simgear/sound/sample_openal.cxx
index 827e524764bab95105462ac905667f2a87307b58..fb72566ca38cfc26d7bd6f8e92209aa42ebd7c94 100644 (file)
--- a/simgear/sound/sample_openal.cxx
+++ b/simgear/sound/sample_openal.cxx
@@ -26,7 +26,7 @@
 #  include <simgear_config.h>
 #endif
 
-#include <stdlib.h>    // rand()
+#include <stdlib.h>    // rand(), free()
 #include <cstring>
 
 #include <simgear/debug/logstream.hxx>
@@ -232,4 +232,7 @@ SGPath SGSoundSample::file_path() const
   return SGPath(_refname);
 }
 
-
+void SGSoundSample::free_data()
+{
+   if ( _data != NULL ) free( _data ); _data = NULL;
+}

diff --git a/simgear/sound/sample_openal.hxx b/simgear/sound/sample_openal.hxx
index 706fa8d07383106ccf8bfe13667ac9d03f8180a2..aa9c893d9d27f89ed35dbcde15c7f72f5c271c80 100644 (file)
--- a/simgear/sound/sample_openal.hxx
+++ b/simgear/sound/sample_openal.hxx
@@ -68,7 +68,7 @@ public:
      * Constructor.
      * @param data Pointer to a memory buffer containing this audio sample data
        The application may free the data by calling free_data(), otherwise it
-       will be resident untill the class is destroyed. This pointer will be
+       will be resident until the class is destroyed. This pointer will be
        set to NULL after calling this function.
      * @param len Byte length of array
      * @param freq Frequency of the provided data (bytes per second)
@@ -188,9 +188,7 @@ public:
     /**
      * Free the data associated with this audio sample
      */
-    void free_data() {
-        if ( _data != NULL ) free( _data ); _data = NULL;
-    }
+    void free_data();
 
     /**
      * Set the source id of this source

diff --git a/simgear/sound/soundmgr_openal.hxx b/simgear/sound/soundmgr_openal.hxx
index d60294dd236af65737617e49d88a9b444baa71d1..d8c2c19af950834591a6d90761c92921e5411302 100644 (file)
--- a/simgear/sound/soundmgr_openal.hxx
+++ b/simgear/sound/soundmgr_openal.hxx
@@ -203,7 +203,7 @@ public:
 
     /**
      * Get a free OpenAL buffer-id
-     * The buffer-id will be asigned to the sample by calling this function.
+     * The buffer-id will be assigned to the sample by calling this function.
      * @param sample Pointer to an audio sample to assign the buffer-id to
      * @return NO_BUFFER if loading of the buffer failed.
      */