Changeset 6332 for code/branches/presentation2/src/orxonox/sound/SoundBuffer.h

Timestamp:

Dec 13, 2009, 12:11:40 AM (14 years ago)

Author:

rgrieder

Message:

Improved SoundBuffer class design and removed its pooling property (just a boolean).

File:

• code/branches/presentation2/src/orxonox/sound/SoundBuffer.h (modified) (3 diffs)

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

@@ -42 +42 @@
     {
         friend class SoundManager;
+        // Make sure nobody deletes an instance (using smart pointers)
+        template <class T>
+        friend void boost::checked_delete(T*);
 
     public:
-        SoundBuffer(const std::string& filename);
-        ~SoundBuffer();
-
         inline ALuint getBuffer()
             { return this->audioBuffer_; }
@@ -55 +55 @@
             { return this->filename_; }
 
-        void setPooling(bool val)
-            { this->bPooling_ = true; }
-        bool getPooling() const
-            { return this->bPooling_; }
-
     private:
+        SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer> >::iterator poolIterator);
+        ~SoundBuffer();
         void loadStandard(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
         void loadOgg(const shared_ptr<ResourceInfo>& fileInfo, DataStreamPtr dataStream);
@@ -67 +64 @@
         ALuint audioBuffer_;
         std::list<shared_ptr<SoundBuffer> >::iterator poolIterator_;
-        bool bPooling_;
     };
 }