Changeset 6270 for code/branches/presentation2/src/orxonox/sound/BaseSound.cc

Timestamp:

Dec 8, 2009, 10:09:39 AM (14 years ago)

Author:

rgrieder

Message:

Switched from ResourceInfo to std::string for the buffer identification. That should speed up BaseSound::setSource() by factor 10 if the buffer already exists.

File:

• code/branches/presentation2/src/orxonox/sound/BaseSound.cc (modified) (2 diffs)

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

@@ -62 +62 @@
     BaseSound::~BaseSound()
     {
-        this->setSource("");
+        this->setSource(std::string());
         if (GameMode::playsSound() && alIsSource(this->audioSource_))
             alDeleteSources(1, &this->audioSource_);
@@ -191 +191 @@
             return;
 
-        // Get DataStream from the resources
-        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(source);
-        if (fileInfo == NULL)
-        {
-            COUT(2) << "Sound: Warning: Sound file '" << source << "' not found" << std::endl;
-            return;
-        }
-
-        this->soundBuffer_ = SoundManager::getInstance().getSoundBuffer(fileInfo);
+        this->soundBuffer_ = SoundManager::getInstance().getSoundBuffer(this->source_);
         if (this->soundBuffer_ == NULL)
             return;