Changeset 6069 for code/branches/sound3/src/orxonox/sound/AmbientSound.h

Timestamp:

Nov 15, 2009, 3:43:06 PM (16 years ago)

Author:

rgrieder

Message:

Detail changes in the sound classes.
Plus fixed the level sound problem (order of XML parameters was wrong).
There is still a large issue when changing an ambient sound source though.

File:

• code/branches/sound3/src/orxonox/sound/AmbientSound.h (modified) (3 diffs)

code/branches/sound3/src/orxonox/sound/AmbientSound.h

@@ -22 +22 @@
  *   Author:
  *      Reto Grieder
+ *      Kevin Young
  *   Co-authors:
  *      ...
  *
  */
+
 #ifndef _AmbientSound_H__
 #define _AmbientSound_H__
@@ -43 +45 @@
     class _OrxonoxExport AmbientSound : public BaseSound, public BaseObject
     {
+        friend class SoundManager;
+
     public:
         AmbientSound(BaseObject* creator);
         virtual ~AmbientSound();
-
-        virtual void play();
-        void replay();      // Continue playing without re-registering the sound
-        virtual void stop();
-        void doStop();
-
-        virtual void setSource(const std::string& source);
 
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -58 +55 @@
         virtual void changedActivity();
 
+        virtual void play();
+        virtual void stop();
+        virtual void pause();
+
+        virtual void setSource(const std::string& source);
 
     private:
+        void doPlay();      // Continue playing without re-registering the sound
+        void doStop();
+        void doPause();
     };
 }