Changeset 7854 for code/trunk/src/orxonox/sound/AmbientSound.cc

Timestamp:

Feb 11, 2011, 1:03:47 PM (13 years ago)

Author:

landauf

Message:

detached AmbientSound from BaseObject - AmbientSound can not be placed directly in a level file anymore
instead added WorldAmbientSound, a BaseObject which can be placed in a level file to create and control ambient sound

with this change, the level can be destroyed completely because WorldAmbientSound can be deleted immediately at the end of the level, while the AmbientSound remains active until it faded out.

File:

• code/trunk/src/orxonox/sound/AmbientSound.cc (modified) (3 diffs)

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

@@ -29 +29 @@
 #include "AmbientSound.h"
 
-#include "core/CoreIncludes.h"
-#include "core/EventIncludes.h"
 #include "core/GameMode.h"
 #include "core/Resource.h"
-#include "core/XMLPort.h"
 #include "SoundManager.h"
 
 namespace orxonox
 {
-    CreateFactory(AmbientSound);
-
-    AmbientSound::AmbientSound(BaseObject* creator)
-        : BaseObject(creator)
-        , Synchronisable(creator)
-        , bPlayOnLoad_(false)
+    AmbientSound::AmbientSound()
+        : bPlayOnLoad_(false)
     {
-        RegisterObject(AmbientSound);
-
         // Ambient sounds always fade in
         this->setVolume(0);
-        this->registerVariables();
     }
 
@@ -59 +49 @@
             SoundManager::getInstance().unregisterAmbientSound(this);
         }
-    }
-
-    void AmbientSound::registerVariables()
-    {
-        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(bPlayOnLoad_,   ObjectDirection::ToClient, new NetworkCallback<AmbientSound>(this, &AmbientSound::playOnLoadChanged));
-    }
-
-    void AmbientSound::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(AmbientSound, XMLPort, xmlelement, mode);
-        BaseSound::XMLPortExtern(xmlelement, mode);
-        XMLPortParam(AmbientSound, "ambientSource", setAmbientSource, getAmbientSource, xmlelement, mode);
-        XMLPortParam(AmbientSound, "playOnLoad", setPlayOnLoad, getPlayOnLoad, xmlelement, mode);
-    }
-
-    void AmbientSound::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(AmbientSound, XMLEventPort, xmlelement, mode);
-        XMLPortEventState(AmbientSound, BaseObject, "play", play, xmlelement, mode);
     }
 
@@ -132 +100 @@
             this->play();
     }
-
-    void AmbientSound::changedActivity()
-    {
-        SUPER(AmbientSound, changedActivity);
-        if (this->isActive())
-            this->play();
-        else
-            this->stop();
-    }
 }