Changeset 2966 for code/branches/sound/src/orxonox/objects

Timestamp:

May 11, 2009, 2:30:54 PM (16 years ago)

Author:

erwin

Message:

moved files, modified to support multiple contexts

Location:

code/branches/sound/src/orxonox/objects

Files:

• Level.cc (modified) (3 diffs)
• Level.h (modified) (1 diff)

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

@@ -57 +57 @@
         if (this->xmlfilename_.length() >= Core::getMediaPathString().length())
             this->xmlfilename_ = this->xmlfilename_.substr(Core::getMediaPathString().length());
+            
+        this->sndmgr_ = new SoundManager();
     }
 
@@ -68 +70 @@
             if (this->xmlfile_)
                 Loader::unload(this->xmlfile_);
+            
+            if(this->ambientsound_ != NULL)
+                delete this->ambientsound_;
+            
+            delete this->sndmgr_;
         }
     }
@@ -158 +165 @@
             {
                 this->ambientsound_ = new SoundBase();
-                this->sndmgr_.addSound(this->ambientsound_);
+                this->sndmgr_->addSound(this->ambientsound_);
             }
 

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

@@ -73 +73 @@
             XMLFile*               xmlfile_;
             std::list<BaseObject*> objects_;
-            SoundManager           sndmgr_;
+            SoundManager*          sndmgr_;
             SoundBase*             ambientsound_;
     };