Changeset 7153 for code/branches/presentation3/src/orxonox/sound

Timestamp:

Jul 12, 2010, 1:08:58 PM (15 years ago)

Author:

scheusso

Message:

• merged network2 branch into presentation3 branch (lots of network traffic and cpu load improvements)
• fixed network related bugs in BigExplosion

Location:

code/branches/presentation3

Files:

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

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

@@ -248 +248 @@
         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/branches/presentation3/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/branches/presentation3/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));
     }