Changeset 7153 for code/branches/presentation3/src/orxonox/sound
- Timestamp:
- Jul 12, 2010, 1:08:58 PM (14 years ago)
- Location:
- code/branches/presentation3
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation3
- Property svn:mergeinfo changed
/code/branches/network2 (added) merged: 6448-6450,6455-6458,6462,6464-6465
- Property svn:mergeinfo changed
-
code/branches/presentation3/src/orxonox/sound/BaseSound.cc
r6502 r7153 248 248 else // No source acquired so far, but might be set to playing or paused 249 249 { 250 State state = this->state_; // save250 State state = static_cast<State>(this->state_); // save 251 251 if (this->isPlaying() || this->isPaused()) 252 252 doPlay(); -
code/branches/presentation3/src/orxonox/sound/BaseSound.h
r6417 r7153 112 112 float volume_; 113 113 bool bLooping_; 114 State state_;114 uint8_t state_; // This Variable is actually of type State 115 115 float pitch_; 116 116 -
code/branches/presentation3/src/orxonox/sound/WorldSound.cc
r6417 r7153 58 58 registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::loopingChanged)); 59 59 registerVariable(pitch_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::pitchChanged)); 60 registerVariable(( int&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::stateChanged));60 registerVariable((uint8_t&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::stateChanged)); 61 61 } 62 62
Note: See TracChangeset
for help on using the changeset viewer.