Changeset 7460 in orxonox.OLD for trunk/src/lib/sound/sound_engine.h

Timestamp:

May 1, 2006, 12:30:34 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

File:

• trunk/src/lib/sound/sound_engine.h (modified) (6 diffs)

trunk/src/lib/sound/sound_engine.h

@@ -22 +22 @@
 // FORWARD DECLARATION
 class PNode;
-class IniParser;
-
-
-//! A class that handles audio via the openAudioLibrary
-class SoundEngine : public BaseObject {
+namespace OrxSound
+{
+  //! A class that handles audio via the openAudioLibrary
+  class SoundEngine : public BaseObject
+  {
   public:
     virtual ~SoundEngine();
@@ -32 +32 @@
     inline static SoundEngine* getInstance() { if (!SoundEngine::singletonRef) SoundEngine::singletonRef = new SoundEngine();  return SoundEngine::singletonRef; };
 
+    SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);
     void loadSettings();
-
-    SoundSource* createSource(const std::string& fileName, PNode* sourceNode = NULL);
+    bool initAudio();
 
     /** @param listener the listener in the scene */
-    void setListener(PNode* listener) { this->listener = listener; };
+  void setListener(const PNode* listener) { this->listener = listener; };
     void setDopplerValues(ALfloat dopplerFactor, ALfloat dopplerVelocity);
+
 
 
@@ -48 +49 @@
     void update();
 
-  // administrative
+    // administrative
     void popALSource(ALuint& source);
     void pushALSource(ALuint& source);
 
-
-    bool initAudio();
-    bool allocateSources(unsigned int count);
-
-  // error handling:
+    // error handling:
     static bool checkError(const std::string& error, unsigned int line);
     bool checkALCError(const std::string& error, unsigned int line);
@@ -64 +61 @@
   private:
     SoundEngine();
+    bool allocateSources(unsigned int count);
 
     void listDevices();
@@ -75 +73 @@
     float                          musicVolume;              //!< the maximum volume of the music in % (0f,1f]
     float                          effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
-    PNode*                         listener;                 //!< The listener of the Scene
+    const PNode*                   listener;                 //!< The listener of the Scene
 
     const std::list<BaseObject*>*  bufferList;               //!< A list of buffers
@@ -84 +82 @@
 
     SDL_mutex*                     sourceMutex;              //!< A mutex so we can not harm the stack
-};
+  };
+}
 
 #endif /* _SOUND_ENGINE_H */