Changeset 6382 for code/branches/presentation2/src/orxonox/sound/AmbientSound.h

Timestamp:

Dec 19, 2009, 12:18:41 AM (14 years ago)

Author:

rgrieder

Message:

Several small changes in sound:

• Fixed a bug that caused a sound source to be initialised on pause() even it already existed
• The XML parameter is now called "looping" instead of "loop" because looping was used really all over the code
• The "play" XML parameter doesn't exist anymore, use "playOnLoad" for AmbientSound only.
• Added "pitch" XML parameter
• Changes in synchronisation policy: Ambient sound should not synchronise the state but instead th new playOnLoad parameter

File:

• code/branches/presentation2/src/orxonox/sound/AmbientSound.h (modified) (2 diffs)

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

@@ -50 +50 @@
     public:
         AmbientSound(BaseObject* creator);
-        ~AmbientSound();
 
         void XMLPort(Element& xmlelement, XMLPort::Mode mode);
@@ -61 +60 @@
 
         void setAmbientSource(const std::string& source);
-        const std::string& getAmbientSource() const { return this->ambientSource_; }
-        inline void ambientSourceChanged(){ this->setAmbientSource(this->ambientSource_); }
+        inline const std::string& getAmbientSource() const
+            { return this->ambientSource_; }
+
+        void setPlayOnLoad(bool val);
+        bool getPlayOnLoad() const
+            { return this->bPlayOnLoad_; }
+
+    protected:
+        ~AmbientSound() { }
 
     private:
-        virtual void preDestroy();
-        void doPlay();
-        void doStop();
-        void doPause();
+        void preDestroy();
         void registerVariables();
         float getRealVolume();
+        inline void ambientSourceChanged()
+            { this->setAmbientSource(this->ambientSource_); }
+        inline void playOnLoadChanged()
+            { this->setPlayOnLoad(this->bPlayOnLoad_); }
 
         std::string ambientSource_; //!< Analogous to source_, but mood independent
+        bool        bPlayOnLoad_;   //!< Play the sound immediately when loaded
     };
 }