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

Timestamp:

Jul 18, 2005, 3:36:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

File:

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

orxonox/trunk/src/lib/sound/sound_engine.h

@@ -27 +27 @@
 
   /** @returns the ID of the buffer used in this SoundBuffer */
-  inline ALuint getID() { return this->bufferID; }
+  inline ALuint getID() const { return this->bufferID; }
 
  private:
@@ -40 +40 @@
 {
  public:
-  SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL);
+  SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);
   ~SoundSource();
 
   // user interaction
   void play();
+  void play(const SoundBuffer* buffer);
   void stop();
   void pause();
@@ -53 +54 @@
   inline ALuint getID() const { return this->sourceID; }
   /** @returns the SoundBuffer of this Source */
-  inline SoundBuffer* getBuffer() const { return this->buffer; }
+  inline const SoundBuffer* getBuffer() const { return this->buffer; }
   /** @returns the SourceNode of this Source */
-  inline PNode* getNode() const { return this->sourceNode;}
+  inline const PNode* getNode() const { return this->sourceNode;}
 
   void setRolloffFactor(ALfloat rolloffFactor);
 
  private:
-  ALuint           sourceID;              //!< The ID of the Source
-  SoundBuffer*     buffer;                //!< The buffer to play in this source.
-  PNode*           sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
+  ALuint                 sourceID;              //!< The ID of the Source
+  const SoundBuffer*     buffer;                //!< The buffer to play in this source.
+  const PNode*           sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
 };