Changeset 6382 for code/branches/presentation2/src/orxonox/sound/WorldSound.cc

Timestamp:

Dec 19, 2009, 12:18:41 AM (16 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/WorldSound.cc (modified) (2 diffs)

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

@@ -51 +51 @@
         this->registerVariables();
     }
-
-    WorldSound::~WorldSound()
-    {
-    }
     
     void WorldSound::registerVariables()
     {
-        registerVariable(volume_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::volumeChanged));
-        registerVariable(source_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::sourceChanged));
+        registerVariable(volume_,   ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::volumeChanged));
+        registerVariable(source_,   ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::sourceChanged));
         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(pitch_, ObjectDirection::ToClient, new NetworkCallback<WorldSound>(this, &WorldSound::pitchChanged));
     }
 
@@ -125 +121 @@
     float WorldSound::getRealVolume()
     {
+        assert(GameMode::playsSound());
         return SoundManager::getInstance().getRealVolume(SoundType::Effects);
     }