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

Timestamp:

Sep 27, 2006, 11:25:43 PM (18 years ago)

Author:

bensch

Message:

renamed NewResource to Resource

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

@@ -9 +9 @@
 
   ResourceSoundBuffer::ResourceSoundBuffer(const std::string& soundName)
-      : SoundBuffer(), NewResource(&ResourceSoundBuffer::type)
+      : SoundBuffer(), Resource(&ResourceSoundBuffer::type)
   {
     this->registerObject(this, ResourceSoundBuffer::_objectList);
@@ -23 +23 @@
     {
       PRINTF(5)("SOUND NOT FOUND: %s\n", soundName.c_str());
-      std::string fileName = this->NewResource::locateFile(soundName);
+      std::string fileName = this->Resource::locateFile(soundName);
       this->SoundBuffer::load(fileName);
-      this->NewResource::addResource(new ResourceSoundBuffer::SoundBufferResourcePointer(soundName, Resources::KeepLevel(0), this->SoundBuffer::dataPointer()));
+      this->Resource::addResource(new ResourceSoundBuffer::SoundBufferResourcePointer(soundName, Resources::KeepLevel(0), this->SoundBuffer::dataPointer()));
     }
   }

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

@@ -13 +13 @@
 namespace OrxSound
 {
-  class ResourceSoundBuffer : public SoundBuffer, public Resources::NewResource
+  class ResourceSoundBuffer : public SoundBuffer, public Resources::Resource
   {
     ObjectListDeclaration(ResourceSoundBuffer);