Changeset 3196 for code/trunk/src/orxonox/sound/SoundManager.h

Timestamp:

Jun 20, 2009, 9:20:47 AM (15 years ago)

Author:

rgrieder

Message:

Merged pch branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/sound/SoundManager.h (modified) (3 diffs)

code/trunk/src/orxonox/sound/SoundManager.h

@@ -25 +25 @@
  *      ...
  */
-#ifndef _SOUNDMANGER_H__
-#define _SOUNDMANGER_H__
-
-#include <AL/al.h>
-#include <AL/alc.h>
+#ifndef _SoundManager_H__
+#define _SoundManager_H__
 
 #include "OrxonoxPrereqs.h"
-#include "orxonox/objects/Tickable.h"
+
+#include <cassert>
+#include <list>
+#include "interfaces/Tickable.h"
 
 namespace orxonox
@@ -49 +49 @@
         void addSound(SoundBase* sound);
         void removeSound(SoundBase* sound);
-        virtual void tick(float dt);
+        void tick(float dt);
         bool isSoundAvailable();
+
+        static SoundManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
     private:
@@ -58 +60 @@
         bool soundavailable_;
 
+        static SoundManager* singletonRef_s;
     }; // class SoundManager
 } // namespace orxonox
 
-#endif // _SOUNDMANAGER_H__
+#endif /* _SoundManager_H__ */