Changeset 6270

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.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (2 diffs)
• SoundBuffer.cc (modified) (3 diffs)
• SoundBuffer.h (modified) (3 diffs)
• SoundManager.cc (modified) (5 diffs)
• SoundManager.h (modified) (1 diff)

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;

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

@@ -40 +40 @@
 namespace orxonox
 {
-    SoundBuffer::SoundBuffer(shared_ptr<ResourceInfo> fileInfo)
-        : fileInfo_(fileInfo)
+    SoundBuffer::SoundBuffer(const std::string& filename)
+        : filename_(filename)
         , audioBuffer_(AL_NONE)
     {
-        if (this->fileInfo_ == NULL)
+        if (this->filename_.empty())
             ThrowException(General, "SoundBuffer construction: fileInfo was NULL");
-        DataStreamPtr dataStream = Resource::open(this->fileInfo_);
 
-        std::string extension(this->fileInfo_->basename.substr(this->fileInfo_->basename.find_last_of('.') + 1));
+        // Get resource info
+        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
+        if (fileInfo == NULL)
+        {
+            COUT(2) << "Sound: Warning: Sound file '" << filename << "' not found" << std::endl;
+            return;
+        }
+        // Open data stream
+        DataStreamPtr dataStream = Resource::open(fileInfo);
+
+        std::string extension(this->filename_.substr(this->filename_.find_last_of('.') + 1));
         if (getLowercase(extension) == "ogg")
         {
             // Try ogg loader
-            this->loadOgg(dataStream);
+            this->loadOgg(fileInfo, dataStream);
         }
         else
         {
             // Try standard OpenAL loader
-            this->loadStandard(dataStream);
+            this->loadStandard(fileInfo, dataStream);
         }
     }
@@ -77 +86 @@
     }
 
-    void SoundBuffer::loadStandard(DataStreamPtr dataStream)
+    void SoundBuffer::loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
     {
         // Read everything into a temporary buffer
-        char* buffer = new char[this->fileInfo_->size];
-        dataStream->read(buffer, this->fileInfo_->size);
+        char* buffer = new char[fileInfo->size];
+        dataStream->read(buffer, fileInfo->size);
         dataStream->seek(0);
 
-        this->audioBuffer_ = alutCreateBufferFromFileImage(buffer, this->fileInfo_->size);
+        this->audioBuffer_ = alutCreateBufferFromFileImage(buffer, fileInfo->size);
         delete[] buffer;
 
@@ -115 +124 @@
     }
 
-    void SoundBuffer::loadOgg(DataStreamPtr dataStream)
+    void SoundBuffer::loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
     {
         char inbuffer[256*1024];

code/branches/presentation2/src/orxonox/sound/SoundBuffer.h

@@ -44 +44 @@
 
     public:
-        SoundBuffer(shared_ptr<ResourceInfo> fileInfo);
+        SoundBuffer(const std::string& filename);
         ~SoundBuffer();
 
@@ -52 +52 @@
         unsigned int getSize() const;
 
-        shared_ptr<ResourceInfo> getFileInfo() const
-            { return this->fileInfo_; }
+        const std::string& getFilename() const
+            { return this->filename_; }
 
         void setPooling(bool val)
@@ -61 +61 @@
 
     private:
-        void loadStandard(DataStreamPtr dataStream);
-        void loadOgg(DataStreamPtr dataStream);
+        void loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
+        void loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
 
-        shared_ptr<ResourceInfo> fileInfo_;
+        std::string filename_;
         ALuint audioBuffer_;
         std::list<shared_ptr<SoundBuffer> >::iterator poolIterator_;

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

@@ -528 +528 @@
     }
 
-    shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(shared_ptr<ResourceInfo> fileInfo)
+    shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(const std::string& filename)
     {
         shared_ptr<SoundBuffer> buffer;
         // Check active or pooled buffers
-        SoundBufferMap::const_iterator it = this->soundBuffers_.find(fileInfo->group + '/' + fileInfo->filename);
+        SoundBufferMap::const_iterator it = this->soundBuffers_.find(filename);
         if (it != this->soundBuffers_.end())
         {
@@ -549 +549 @@
             try
             {
-                buffer.reset(new SoundBuffer(fileInfo));
+                buffer.reset(new SoundBuffer(filename));
                 buffer->poolIterator_ = this->effectsPool_.end();
             }
@@ -557 +557 @@
                 return buffer;
             }
-            this->soundBuffers_[fileInfo->group + '/' + fileInfo->filename] = buffer;
+            this->soundBuffers_[filename] = buffer;
         }
         return buffer;
@@ -567 +567 @@
         if (buffer.use_count() != 2)
             return;
-        SoundBufferMap::iterator it = this->soundBuffers_.find(buffer->fileInfo_->group + '/' + buffer->fileInfo_->filename);
+        SoundBufferMap::iterator it = this->soundBuffers_.find(buffer->getFilename());
         if (it != this->soundBuffers_.end())
         {
@@ -580 +580 @@
                     this->effectsPool_.pop_back();
                     // Remove from buffer map too
-                    SoundBufferMap::iterator itDel = this->soundBuffers_.find(bufferDel->fileInfo_->group + '/' + bufferDel->fileInfo_->filename);
+                    SoundBufferMap::iterator itDel = this->soundBuffers_.find(bufferDel->getFilename());
                     if (itDel != this->soundBuffers_.end())
                         this->soundBuffers_.erase(itDel);

code/branches/presentation2/src/orxonox/sound/SoundManager.h

@@ -100 +100 @@
         bool getMute(SoundType::Value type); // tolua_export
 
-        shared_ptr<SoundBuffer> getSoundBuffer(shared_ptr<ResourceInfo> fileInfo);
+        shared_ptr<SoundBuffer> getSoundBuffer(const std::string& filename);
         void releaseSoundBuffer(const shared_ptr<SoundBuffer>& buffer, bool bPoolBuffer);