Changeset 6188

Timestamp:

Dec 1, 2009, 6:49:48 PM (14 years ago)

Author:

rgrieder

Message:

Fixed a bug in BaseSound that caused every sound to play immediately when loaded.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (1 diff)
• BaseSound.h (modified) (1 diff)

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -69 +69 @@
         XMLPortParam(BaseSound, "volume", setVolume,  getVolume,  xmlelement, mode);
         XMLPortParam(BaseSound, "loop",   setLooping, getLooping, xmlelement, mode);
-        XMLPortParam(BaseSound, "play",   play,       isPlaying,  xmlelement, mode);
+        XMLPortParam(BaseSound, "play",   setPlaying, isPlaying,  xmlelement, mode);
         XMLPortParam(BaseSound, "source", setSource,  getSource,  xmlelement, mode);
     }

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

@@ -59 +59 @@
         bool isStopped() { return this->state_ == Stopped; }
 
+        void setPlaying(bool val)
+            { val ? this->play() : this->stop(); }
+
         virtual void setSource(const std::string& source);
         virtual const std::string& getSource() const { return this->source_; }