Changeset 2950 for code/branches/sound/src/orxonox

Timestamp:

May 4, 2009, 3:40:08 PM (16 years ago)

Author:

erwin

Message:

ambient sound loading for levels

Location:

code/branches/sound/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/Level.cc (modified) (2 diffs)
• objects/Level.h (modified) (3 diffs)

code/branches/sound/src/orxonox/CMakeLists.txt

@@ -58 +58 @@
   core
   network
-  #audio
+  sound
 )
 

code/branches/sound/src/orxonox/objects/Level.cc

@@ -77 +77 @@
         XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
+        
+        XMLPortParamLoadOnly(Level, "ambientsound", loadAmbientSound, xmlelement, mode);
 
         XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
@@ -148 +150 @@
     }
 
+    void Level::loadAmbientSound(const std::string& filename)
+    {
+        if(filename == "") return;
+        else
+        {
+            if(this->ambientsound_ == NULL)
+            {
+                this->ambientsound_ = new SoundBase();
+                this->sndmgr_.addSound(this->ambientsound_);
+            }
+
+            this->ambientsound_->loadFile(filename);
+            this->ambientsound_->play();
+        }
+    }
+
     void Level::playerEntered(PlayerInfo* player)
     {

code/branches/sound/src/orxonox/objects/Level.h

@@ -33 +33 @@
 
 #include "network/synchronisable/Synchronisable.h"
+#include "sound/SoundBase.h"
+#include "sound/SoundManager.h"
 #include "core/BaseObject.h"
 
@@ -50 +52 @@
             inline const std::string& getDescription() const
                 { return this->description_; }
+
+            void loadAmbientSound(const std::string& filename);
 
             void playerEntered(PlayerInfo* player);
@@ -69 +73 @@
             XMLFile*               xmlfile_;
             std::list<BaseObject*> objects_;
+            SoundManager           sndmgr_;
+            SoundBase*             ambientsound_;
     };
 }