Changeset 9804 in orxonox.OLD

Timestamp:

Sep 24, 2006, 1:15:47 PM (18 years ago)

Author:

bensch

Message:

LoadResource should work… testing soon

Location:

branches/new_class_id/src/lib/sound

Files:

• Makefile.am (modified) (2 diffs)
• sound_buffer.cc (modified) (1 diff)
• sound_buffer.h (modified) (2 diffs)

branches/new_class_id/src/lib/sound/Makefile.am

@@ -8 +8 @@
                         sound_buffer.cc \
                         sound_buffer_data.cc \
+                        resource_sound_buffer.cc \
                         ogg_player.cc
 
@@ -14 +15 @@
                  sound_buffer.h \
                  sound_buffer_data.h \
+                 resource_sound_buffer.h \
                  ogg_player.h

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

@@ -18 +18 @@
 #include "sound_buffer.h"
 
-#include "sound_engine.h"
-
-#include "sdlincl.h"
-#include <cassert>
-#include "debug.h"
-#include "sys/stat.h"
-#include "helper_functions.h"
-
-#ifdef HAVE_SDL_SDL_H
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
-#else
-#include <SDL.h>
-#include <SDL_endian.h>
-#endif
 namespace OrxSound
 {

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

@@ -20 +20 @@
   public:
     SoundBuffer();
+    SoundBuffer(const SoundBuffer& buffer) { this->data = buffer.data; }
+    SoundBuffer(const SoundBufferData::Pointer& dataPointer) { this->data = dataPointer; };
     SoundBuffer(const std::string& fileName);
 
@@ -32 +34 @@
     inline ALuint getID() const { return this->data->getID(); }
 
+    /** @returns the DataPointer */
+    const SoundBufferData::Pointer& dataPointer() const { return data; }
+    /** @param dataPointer the data to acquire @brief Buffer shall acquire dataPointers data */
+    void acquireData(const SoundBufferData::Pointer& dataPointer)  { data = dataPointer; };
   private:
     SoundBufferData::Pointer    data;