Changeset 6406 for code/branches/presentation2/src/orxonox/sound

Timestamp:

Dec 23, 2009, 8:45:56 PM (15 years ago)

Author:

rgrieder

Message:

Mood changes should now be working and with immediate (but delayed because of loading) effect.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (2 diffs)
• AmbientSound.h (modified) (3 diffs)

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

@@ -35 +35 @@
 #include "core/XMLPort.h"
 #include "SoundManager.h"
-#include "MoodManager.h"
 
 namespace orxonox
@@ -111 +110 @@
     {
         this->ambientSource_ = source;
+        this->moodChanged(this->getMood());
+    }
+
+    void AmbientSound::moodChanged(const std::string& mood)
+    {
         if (GameMode::playsSound())
         {
-            const std::string& path = "ambient/" + MoodManager::getInstance().getMood() + '/' + source;
+            const std::string& path = "ambient/" + MoodManager::getInstance().getMood() + '/' + this->ambientSource_;
             shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(path);
             if (fileInfo != NULL)
                 this->setSource(path);
             else
-                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
+                COUT(3) << "Sound: " << this->ambientSource_ << ": Not a valid name! Ambient sound will not change." << std::endl;
         }
     }

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

@@ -34 +34 @@
 
 #include "core/BaseObject.h"
-#include "sound/BaseSound.h"
 #include "network/synchronisable/Synchronisable.h"
+#include "BaseSound.h"
+#include "MoodManager.h"
 
 namespace orxonox
@@ -44 +45 @@
      *
      */
-    class _OrxonoxExport AmbientSound : public BaseSound, public BaseObject, public Synchronisable
+    class _OrxonoxExport AmbientSound : public BaseSound, public BaseObject, public Synchronisable, public MoodListener
     {
         friend class SoundManager;
@@ -74 +75 @@
         void registerVariables();
         float getRealVolume();
+        void moodChanged(const std::string& mood);
         inline void ambientSourceChanged()
             { this->setAmbientSource(this->ambientSource_); }