Changeset 10771 for code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc

Timestamp:

Nov 7, 2015, 5:24:58 PM (9 years ago)

Author:

landauf

Message:

using std::shared_ptr instead of boost::shared_ptr (same for weak_ptr)

File:

• code/branches/cpp11_v2/src/orxonox/sound/SoundBuffer.cc (modified) (4 diffs)

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

@@ -39 +39 @@
 namespace orxonox
 {
-    SoundBuffer::SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer>>::iterator poolIterator)
+    SoundBuffer::SoundBuffer(const std::string& filename, std::list<std::shared_ptr<SoundBuffer>>::iterator poolIterator)
         : filename_(filename)
         , audioBuffer_(AL_NONE)
@@ -48 +48 @@
 
         // Get resource info
-        shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
+        std::shared_ptr<ResourceInfo> fileInfo = Resource::getInfo(filename);
         if (fileInfo == nullptr)
         {
@@ -83 +83 @@
     }
 
-    void SoundBuffer::loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
+    void SoundBuffer::loadStandard(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
     {
         // Read everything into a temporary buffer
@@ -127 +127 @@
     }
 
-    void SoundBuffer::loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
+    void SoundBuffer::loadOgg(const std::shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream)
     {
         char inbuffer[256*1024];