Changeset 4205 in orxonox.OLD

Timestamp:

May 17, 2005, 2:09:59 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/openAL: segfault-prevention

Location:

orxonox/branches/openAL/src

Files:

• lib/sound/sound_engine.cc (modified) (2 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)

orxonox/branches/openAL/src/lib/sound/sound_engine.cc

@@ -234 +234 @@
 
   // updating the Listeners Position
-  if (this->listener)
+  if (likely(this->listener != NULL))
     {
       alListener3f(AL_POSITION,
@@ -256 +256 @@
   while (enumSource)
     {
-      alSource3f(enumSource->getID(), AL_POSITION,
-                 enumSource->getNode()->getAbsCoor().x,
-                 enumSource->getNode()->getAbsCoor().y,
-                 enumSource->getNode()->getAbsCoor().z);
-      alSource3f(enumSource->getID(), AL_VELOCITY,
-                 enumSource->getNode()->getVelocity().x,
-                 enumSource->getNode()->getVelocity().y,
-                 enumSource->getNode()->getVelocity().z);
-
+      if (likely(enumSource->getNode()!=NULL))
+      {
+        alSource3f(enumSource->getID(), AL_POSITION,
+                   enumSource->getNode()->getAbsCoor().x,
+                   enumSource->getNode()->getAbsCoor().y,
+                   enumSource->getNode()->getAbsCoor().z);
+        alSource3f(enumSource->getID(), AL_VELOCITY,
+                   enumSource->getNode()->getVelocity().x,
+                   enumSource->getNode()->getVelocity().y,
+                   enumSource->getNode()->getVelocity().z);
+      }
       enumSource = iterator->nextElement();
     }

orxonox/branches/openAL/src/lib/sound/sound_engine.h

@@ -71 +71 @@
   virtual ~SoundEngine(void);
 
-  SoundSource* createSource(const char* fileName, PNode* sourceNode);
+  SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL);
 
   void setListener(PNode* listener);

orxonox/branches/openAL/src/story_entities/world.cc

@@ -490 +490 @@
 
   SoundEngine::getInstance()->setListener(tn);
-  SoundBuffer* tBuffer = new SoundBuffer(ResourceManager::getFullName("sound/explo.wav"));
   SoundSource* tSound = SoundEngine::getInstance()->createSource("sound/explo.wav", this->localPlayer);
   tSound->setRolloffFactor(0);