Changeset 9854 in orxonox.OLD for branches/new_class_id/src/lib/sound

Timestamp:

Sep 28, 2006, 10:17:56 AM (18 years ago)

Author:

bensch

Message:

more nice comments, and also updated the KeepLevel loading (if you want to load a Resource to a KeepLevel just append it at loadtime:
eg.:
Texture tex = ResourceTexture(orxonox.png, GL_TEXTURE_2D, GameEnd);
where GameEnd is the KeepLevel as defined in orxonox.cc→initResources()

Location:

branches/new_class_id/src/lib/sound

Files:

• resource_sound_buffer.cc (modified) (2 diffs)
• resource_sound_buffer.h (modified) (1 diff)

branches/new_class_id/src/lib/sound/resource_sound_buffer.cc

@@ -8 +8 @@
   ObjectListDefinition(ResourceSoundBuffer);
 
-  ResourceSoundBuffer::ResourceSoundBuffer(const std::string& soundName)
+  ResourceSoundBuffer::ResourceSoundBuffer(const std::string& soundName, const Resources::KeepLevel& keepLevel)
       : SoundBuffer(), Resource(&ResourceSoundBuffer::type)
   {
@@ -25 +25 @@
       std::string fileName = this->Resource::locateFile(soundName);
       this->SoundBuffer::load(fileName);
-      this->Resource::addResource(new ResourceSoundBuffer::SoundBufferResourcePointer(soundName, Resources::KeepLevel(0), this->SoundBuffer::dataPointer()));
+      this->Resource::addResource(new ResourceSoundBuffer::SoundBufferResourcePointer(soundName, keepLevel, this->SoundBuffer::dataPointer()));
     }
   }

branches/new_class_id/src/lib/sound/resource_sound_buffer.h

@@ -17 +17 @@
     ObjectListDeclaration(ResourceSoundBuffer);
   public:
-    ResourceSoundBuffer(const std::string& soundName);
-    static ResourceSoundBuffer createFromString(const std::string& loadString) { return ResourceSoundBuffer(loadString); };
+    ResourceSoundBuffer(const std::string& soundName,
+                        const Resources::KeepLevel& keepLevel = Resources::KeepLevel());
+    static ResourceSoundBuffer createFromString(const std::string& loadString, const Resources::KeepLevel& keepLevel = Resources::KeepLevel())
+    { return ResourceSoundBuffer(loadString, keepLevel); };
 
   private: