Merge branch 'feature/c++11'

[supertux.git] / src / audio / sound_manager.hpp

diff --git a/src/audio/sound_manager.hpp b/src/audio/sound_manager.hpp
index 12f1944..3744c62 100644 (file)
--- a/src/audio/sound_manager.hpp
+++ b/src/audio/sound_manager.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,22 +12,17 @@
 //  GNU General Public License for more details.
 //
 //  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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef __SOUND_MANAGER_H__
-#define __SOUND_MANAGER_H__
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_AUDIO_SOUND_MANAGER_HPP
+#define HEADER_SUPERTUX_AUDIO_SOUND_MANAGER_HPP
 
+#include <map>
 #include <string>
 #include <vector>
-#include <map>
 
-#ifndef MACOSX
-#include <AL/alc.h>
-#include <AL/al.h>
-#else
-#include <OpenAL/alc.h>
-#include <OpenAL/al.h>
-#endif
+#include <al.h>
+#include <alc.h>
 
 #include "math/vector.hpp"
 
@@ -75,7 +68,7 @@ public:
   bool is_sound_enabled() { return sound_enabled; }
 
   bool is_audio_enabled() {
-                       return device != 0 && context != 0;
+    return device != 0 && context != 0;
   }
 
   void update();
@@ -118,8 +111,12 @@ private:
 
   bool music_enabled;
   std::string current_music;
-};
 
-extern SoundManager* sound_manager;
+private:
+  SoundManager(const SoundManager&);
+  SoundManager& operator=(const SoundManager&);
+};
 
 #endif
+
+/* EOF */