Changeset 5896 for code/branches/core5/src/orxonox/sound/BaseSound.h

Timestamp:

Oct 6, 2009, 11:12:01 PM (15 years ago)

Author:

rgrieder

Message:

Added some basic sound classes: WorldSound (to be used for 3D sound, is a WorldEntity) and AmbientSound (BaseObject, just add it somewhere and it will play with playOnLoad=true).
Also moved the sound listener device updating to the HumanController. We might want to modify this again so that the listener is at the camera position again, not at the space ship.

File:

• code/branches/core5/src/orxonox/sound/BaseSound.h (moved) (moved from code/branches/core5/src/orxonox/sound/SoundBase.h) (2 diffs)

code/branches/core5/src/orxonox/sound/BaseSound.h

@@ -21 +21 @@
  *
  *   Author:
- *       Erwin 'vaiursch' Herrsche
+ *      Erwin 'vaiursch' Herrsche
  *   Co-authors:
- *      ...
+ *      Reto Grieder
  *
  */
-#ifndef _SoundBase_H__
-#define _SoundBase_H__
+#ifndef _BaseSound_H__
+#define _BaseSound_H__
 
 #include "OrxonoxPrereqs.h"
-#include <cstring> // define NULL
+
+#include <string>
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
 {
     /**
-     * The SoundBase class is the base class for all sound file loader classes.
+     * The BaseSound class is the base class for all sound file loader classes.
      * It server as main interface to the OpenAL library.
      *
      */
-    class _OrxonoxExport SoundBase
+    class _OrxonoxExport BaseSound : virtual public OrxonoxClass
     {
     public:
-        SoundBase(WorldEntity* entity = NULL);
-        ~SoundBase();
+        BaseSound();
+        virtual ~BaseSound();
 
-        void attachToEntity(WorldEntity* entity);
-        void update();
-        void play(bool loop = false);
+        void play();
         void stop();
         void pause();
@@ -55 +55 @@
         bool isStopped();
 
-        bool loadFile(const std::string& filename);
+        void setSoundFile(const std::string& soundFile);
+        const std::string& getSoundFile() { return this->soundFile_; }
+
+        bool getPlayOnLoad() { return this->bPlayOnLoad_; }
+        void setPlayOnLoad(bool val);
+
+        bool getLoop() { return this->bLoop_; }
+        void setLoop(bool val) { this->bLoop_ = val; }
+
+    protected:
+        //ALuint loadOggFile(const std::string& filename);
+        ALint getSourceState();
+
+        ALuint source_;
+        ALuint buffer_;
 
     private:
-        ALuint loadOggFile(const std::string& filename);
-        ALuint source_;
-        ALuint buffer_;
-        WorldEntity* entity_;
+        std::string soundFile_;
+        bool bPlayOnLoad_;
+        bool bLoop_;
+    };
+}
 
-        ALint getSourceState();
-    }; // class SoundBase
-} // namepsace orxonox
-
-#endif /* _SoundBase_H__ */
+#endif /* _BaseSound_H__ */