Changeset 9805 in orxonox.OLD for branches/new_class_id/src/lib/sound/sound_engine.cc

Timestamp:

Sep 24, 2006, 3:21:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: SoundSource completely added as a Resource

File:

• branches/new_class_id/src/lib/sound/sound_engine.cc (modified) (3 diffs)

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

@@ -26 +26 @@
 #include "util/preferences.h"
 #include "globals.h"
+#include "resource_sound_buffer.h"
 
 namespace OrxSound
@@ -119 +120 @@
   SoundSource* SoundEngine::createSource(const std::string& fileName, PNode* sourceNode)
   {
-    SoundBuffer* buffer = NULL;
+    SoundBuffer buffer;
     if (!fileName.empty())
     {
-      buffer= (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL);
-      if (buffer == NULL)
+      buffer = ResourceSoundBuffer(fileName);
+      if (!buffer.loaded())
         PRINTF(2)("Wav-Sound %s could not be loaded onto new Source\n", fileName.c_str());
     }
@@ -215 +216 @@
         if(play == AL_PLAYING)
         {
-          if (likely((*sourceIT)->getNode() != NULL))
+          if (likely((*sourceIT)->getNode() != NULL))
           {
             alSource3f((*sourceIT)->getID(), AL_POSITION,