- Timestamp:
- Dec 8, 2009, 10:09:39 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/orxonox/sound/SoundManager.cc
r6269 r6270 528 528 } 529 529 530 shared_ptr<SoundBuffer> SoundManager::getSoundBuffer( shared_ptr<ResourceInfo> fileInfo)530 shared_ptr<SoundBuffer> SoundManager::getSoundBuffer(const std::string& filename) 531 531 { 532 532 shared_ptr<SoundBuffer> buffer; 533 533 // Check active or pooled buffers 534 SoundBufferMap::const_iterator it = this->soundBuffers_.find(file Info->group + '/' + fileInfo->filename);534 SoundBufferMap::const_iterator it = this->soundBuffers_.find(filename); 535 535 if (it != this->soundBuffers_.end()) 536 536 { … … 549 549 try 550 550 { 551 buffer.reset(new SoundBuffer(file Info));551 buffer.reset(new SoundBuffer(filename)); 552 552 buffer->poolIterator_ = this->effectsPool_.end(); 553 553 } … … 557 557 return buffer; 558 558 } 559 this->soundBuffers_[file Info->group + '/' + fileInfo->filename] = buffer;559 this->soundBuffers_[filename] = buffer; 560 560 } 561 561 return buffer; … … 567 567 if (buffer.use_count() != 2) 568 568 return; 569 SoundBufferMap::iterator it = this->soundBuffers_.find(buffer-> fileInfo_->group + '/' + buffer->fileInfo_->filename);569 SoundBufferMap::iterator it = this->soundBuffers_.find(buffer->getFilename()); 570 570 if (it != this->soundBuffers_.end()) 571 571 { … … 580 580 this->effectsPool_.pop_back(); 581 581 // Remove from buffer map too 582 SoundBufferMap::iterator itDel = this->soundBuffers_.find(bufferDel-> fileInfo_->group + '/' + bufferDel->fileInfo_->filename);582 SoundBufferMap::iterator itDel = this->soundBuffers_.find(bufferDel->getFilename()); 583 583 if (itDel != this->soundBuffers_.end()) 584 584 this->soundBuffers_.erase(itDel);
Note: See TracChangeset
for help on using the changeset viewer.