Changeset 2899 for code/branches/sound

Timestamp:

Apr 6, 2009, 3:08:09 PM (16 years ago)

Author:

erwin

Message:

implemented SoundManager class

Location:

code/branches/sound/src/sound

Files:

• SoundBase.cc (added)
• SoundBase.h (modified) (3 diffs)
• SoundManager.cc (added)
• SoundManager.h (modified) (1 diff)

code/branches/sound/src/sound/SoundBase.h

@@ -28 +28 @@
 
 #include <al.h>
+#include <string>
 
 class Ogre::SceneNode;
@@ -34 +35 @@
 namespace orxonox
 {
-
+    /**
+     * The SoudBase class is the base class for all sound file loader classes.
+     * It server as main interface to the OpenAL library.
+     *
+     */
     class SoundBase
     {
@@ -49 +54 @@
         bool isPlaying();
 
+        virtual void loadFile(std::string filename) = 0;
+
     private:
         ALuint source_;

code/branches/sound/src/sound/SoundManager.h

@@ -29 +29 @@
 #include <alc.h>
 
+#include <Tickable.h>
+
 class SoundBase;
 
 namespace Orxonox
 {
+    /**
+     * The SoundManager class manages the OpenAL device, context and listener
+     * position. It has a list of all SoundBase objects and calls their update
+     * function every tick. It is a singleton.
+     *
+     */
     class SoundManager : public Tickable
     {
     public:
-        SoundManager();
+        static SoundManager* instance();
         
         void addSound(SoundBase* sound);
         void removeSound(SoundBase* sound);
-
+        
         void tick(float dt);
 
     private:
+        SoundManager(); // private constructor -> singleton
+        static SoundManager* singleton_;
+
         ALCcontext* context_;
         ALCdevice* device_;