Changeset 9806 in orxonox.OLD for branches/new_class_id/src/lib/sound

Timestamp:

Sep 24, 2006, 10:30:13 PM (18 years ago)

Author:

bensch

Message:

try with the shader

Location:

branches/new_class_id/src/lib/sound

Files:

• ogg_player.h (modified) (1 diff)
• sound_buffer.cc (modified) (4 diffs)
• sound_buffer.h (modified) (3 diffs)

branches/new_class_id/src/lib/sound/ogg_player.h

@@ -100 +100 @@
 
 
-    std::string         _title;
-    std::string         _artist;
-    std::string         _album;
-    std::string         _vendor;
+    std::string         _title;               //!< Song Title.
+    std::string         _artist;              //!< Artist Name of the current song.
+    std::string         _album;               //!< Album Name of the current song.
+    std::string         _vendor;              //!< Vendor Name of the current song.
   };
 

branches/new_class_id/src/lib/sound/sound_buffer.cc

@@ -18 +18 @@
 #include "sound_buffer.h"
 
+
 namespace OrxSound
 {
+  ObjectListDefinition(SoundBuffer);
   //////////////////
   /* SOUND-BUFFER */
@@ -26 +28 @@
       : data(new SoundBufferData)
   {
+    this->registerObject(this, SoundBuffer::_objectList);
   }
   /**
@@ -34 +37 @@
       : data(new SoundBufferData)
   {
+    this->registerObject(this, SoundBuffer::_objectList);
     this->load(fileName);
   }
@@ -39 +43 @@
   SoundBuffer::SoundBuffer(const SoundBuffer& buffer)
       : data(buffer.data)
-  {  }
+  {
+    this->registerObject(this, SoundBuffer::_objectList);
+  }
 
   SoundBuffer::SoundBuffer(const SoundBufferData::Pointer& dataPointer)
       : data(dataPointer)
-  {  };
+  {
+    this->registerObject(this, SoundBuffer::_objectList);
+  };
+
+  SoundBuffer::~SoundBuffer()
+  {
+    printf("Deleting Object of type SoundBuffer\n");
+  }
+
 }

branches/new_class_id/src/lib/sound/sound_buffer.h

@@ -7 +7 @@
 #define _SOUND_BUFFER_H
 
+#include "base_object.h"
 #include "sound_buffer_data.h"
 
@@ -12 +13 @@
 {
   //! A class that represents a datastructure to play Sounds.
-  class SoundBuffer
+  class SoundBuffer : virtual public BaseObject
   {
+    ObjectListDeclaration(SoundBuffer);
   public:
     SoundBuffer();
@@ -19 +21 @@
     SoundBuffer(const SoundBufferData::Pointer& dataPointer);
     SoundBuffer(const std::string& fileName);
+    virtual ~SoundBuffer();
 
     bool operator==(const SoundBuffer& buffer) const {return this->data == buffer.data; };