Changeset 6382 for code/branches/presentation2/src/orxonox/sound/AmbientSound.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/AmbientSound.cc (modified) (9 diffs)

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

@@ -42 +42 @@
 
     AmbientSound::AmbientSound(BaseObject* creator)
-        : BaseObject(creator), Synchronisable(creator)
+        : BaseObject(creator)
+        , Synchronisable(creator)
+        , bPlayOnLoad_(false)
     {
         RegisterObject(AmbientSound);
@@ -49 +51 @@
         this->setVolume(0);
         this->registerVariables();
-    }
-
-    AmbientSound::~AmbientSound()
-    {
     }
 
@@ -67 +65 @@
     {
         registerVariable(ambientSource_, ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::ambientSourceChanged));
-        registerVariable(bLooping_, ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::loopingChanged));
-        registerVariable(pitch_, ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::pitchChanged));
-        registerVariable((int&)(BaseSound::state_), ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::stateChanged));
+        registerVariable(bLooping_,      ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::loopingChanged));
+        registerVariable(pitch_,         ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::pitchChanged));
+        registerVariable(bPlayOnLoad_,   ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::playOnLoadChanged));
     }
 
@@ -76 +74 @@
         SUPER(AmbientSound, XMLPort, xmlelement, mode);
         BaseSound::XMLPortExtern(xmlelement, mode);
-        XMLPortParam(AmbientSound, "ambientsource", setAmbientSource, getAmbientSource, xmlelement, mode);
+        XMLPortParam(AmbientSound, "ambientSource", setAmbientSource, getAmbientSource, xmlelement, mode);
+        XMLPortParam(AmbientSound, "playOnLoad", setPlayOnLoad, getPlayOnLoad, xmlelement, mode);
     }
 
@@ -88 +87 @@
     {
         if (GameMode::playsSound())
-        {
             SoundManager::getInstance().registerAmbientSound(this);
-        }
-        else
-            BaseSound::play();
-    }
-
-    void AmbientSound::doPlay()
-    {
-        BaseSound::play();
     }
 
@@ -103 +93 @@
     {
         if (GameMode::playsSound())
-        {
             SoundManager::getInstance().unregisterAmbientSound(this);
-        }
-        else
-            BaseSound::stop();
-    }
-
-    void AmbientSound::doStop()
-    {
-        BaseSound::stop();
     }
 
@@ -118 +99 @@
     {
         if (GameMode::playsSound())
-        {
             SoundManager::getInstance().pauseAmbientSound(this);
-        }
-        else
-            BaseSound::pause();
     }
     
@@ -129 +106 @@
         assert(GameMode::playsSound());
         return SoundManager::getInstance().getRealVolume(SoundType::Music);
-    }
-
-    void AmbientSound::doPause()
-    {
-        BaseSound::pause();
     }
 
@@ -150 +122 @@
     }
 
+    void AmbientSound::setPlayOnLoad(bool val)
+    {
+        this->bPlayOnLoad_ = val;
+        if (val)
+            this->play();
+    }
+
     void AmbientSound::changedActivity()
     {