Use a reference counted pointer for the condition.

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

diff --git a/simgear/sound/soundmgr_openal.hxx b/simgear/sound/soundmgr_openal.hxx
index dd4d3913144872add74c5602946e286e5a4be0c2..59cb24e4acf0eaa510caa1eea12a756b36fdc3e1 100644 (file)
--- a/simgear/sound/soundmgr_openal.hxx
+++ b/simgear/sound/soundmgr_openal.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -39,7 +39,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 
 #if defined( __APPLE__ )
@@ -52,8 +52,8 @@
 
 #include "sample_openal.hxx"
 
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::map;
+using std::string;
 
 
 typedef map < string, SGSharedPtr<SGSoundSample> > sample_map;
@@ -206,7 +206,9 @@ public:
         listener_vel[0] = vel[0];
         listener_vel[1] = vel[1];
         listener_vel[2] = vel[2];
+#ifdef USE_OPEN_AL_DOPPLER
         alListenerfv( AL_VELOCITY, listener_vel );
+#endif
     }
 
     /**
@@ -231,12 +233,12 @@ public:
     }
 
     /**
-     * set the positions of all managaged sound sources 
+     * set the positions of all managed sound sources 
      */
     void set_source_pos_all( ALfloat *pos );
 
     /**
-     * set the velocities of all managaged sound sources 
+     * set the velocities of all managed sound sources 
      */
     void set_source_vel_all( ALfloat *pos );
 };