Changeset 7163 for code/trunk/src/orxonox/sound

Timestamp:

Aug 11, 2010, 8:55:13 AM (14 years ago)

Author:

dafrick

Message:

Merged presentation3 branch into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/sound/BaseSound.cc (modified) (2 diffs)
• src/orxonox/sound/BaseSound.h (modified) (1 diff)
• src/orxonox/sound/SoundStreamer.cc (modified) (1 prop)
• src/orxonox/sound/SoundStreamer.h (modified) (1 prop)
• src/orxonox/sound/WorldSound.cc (modified) (1 diff)

code/trunk/src/orxonox/sound/BaseSound.cc

@@ -33 +33 @@
 #include <al.h>
 
+#include "util/Math.h"
 #include "core/CoreIncludes.h"
 #include "core/GameMode.h"
@@ -248 +249 @@
         else // No source acquired so far, but might be set to playing or paused
         {
-            State state = this->state_; // save
+            State state = static_cast<State>(this->state_); // save
             if (this->isPlaying() || this->isPaused())
                 doPlay();

code/trunk/src/orxonox/sound/BaseSound.h

@@ -112 +112 @@
         float           volume_;
         bool            bLooping_;
-        State           state_;
+        uint8_t         state_;       // This Variable is actually of type State
         float           pitch_;
 

code/trunk/src/orxonox/sound/WorldSound.cc

@@ -58 +58 @@
         registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::loopingChanged));
         registerVariable(pitch_,    ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::pitchChanged));
-        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::stateChanged));
+        registerVariable((uint8_t&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::stateChanged));
     }