Initial work on making OpenAL private to the sound code.

[simgear.git] / simgear / sound / sample_openal.hxx

diff --git a/simgear/sound/sample_openal.hxx b/simgear/sound/sample_openal.hxx
index a32b8719c7d6fb6e38d5d41ed56563ba7c9af942..706fa8d07383106ccf8bfe13667ac9d03f8180a2 100644 (file)
--- a/simgear/sound/sample_openal.hxx
+++ b/simgear/sound/sample_openal.hxx
@@ -30,20 +30,20 @@
 #ifndef _SG_SAMPLE_HXX
 #define _SG_SAMPLE_HXX 1
 
-#ifndef __cplusplus
-# error This library requires C++
-#endif
-
 #include <string>
-#include <cstdlib>
 
 #include <simgear/compiler.h>
-#include <simgear/debug/logstream.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
-
+#include <simgear/math/SGMath.hxx>
+     
 class SGPath;
 
+#ifndef AL_FORMAT_MONO8
+     #define AL_FORMAT_MONO8    0x1100
+#endif
+ 
+
 /**
  * manages everything we need to know for an individual audio sample
  */
@@ -513,7 +513,7 @@ private:
     bool _out_of_range;
     bool _is_file;
 
-    string random_string();
+    std::string random_string();
 };