Changeset 7290 in orxonox.OLD

Timestamp:

Apr 14, 2006, 9:58:17 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more debug

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (1 diff)
• lib/sound/sound_buffer.cc (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (9 diffs)
• lib/sound/sound_source.cc (modified) (5 diffs)
• story_entities/game_world.cc (modified) (2 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -49 +49 @@
 OggPlayer::~OggPlayer()
 {
-  //this->release();
+  this->release();
 }
 

trunk/src/lib/sound/sound_buffer.cc

@@ -47 +47 @@
   //  SoundEngine::getInstance()->removeBuffer(this);
   alDeleteBuffers(1, &this->bufferID);
+  SoundEngine::checkError("SoundBuffer: Delete Buffer", __LINE__);
 }
 

trunk/src/lib/sound/sound_engine.cc

@@ -70 +70 @@
   {
     while (this->sourceList->size() > 0)
-      delete dynamic_cast<SoundSource*>(this->sourceList->front());
+      delete static_cast<SoundSource*>(this->sourceList->front());
   }
 
@@ -76 +76 @@
   {
     alDeleteSources(1, &this->ALSources.top());
+    SoundEngine::checkError("Deleting Source", __LINE__);
     this->ALSources.pop();
   }
@@ -83 +84 @@
   {
     while(this->bufferList->size() > 0)
-      ResourceManager::getInstance()->unload(dynamic_cast<SoundBuffer*>(this->bufferList->front()));
+      ResourceManager::getInstance()->unload(static_cast<SoundBuffer*>(this->bufferList->front()));
   }
 
@@ -146 +147 @@
     this->ALSources.pop();
   }
-
 }
 
@@ -155 +155 @@
 void SoundEngine::update()
 {
-
   // updating the Listeners Position
   if (likely(this->listener != NULL))
@@ -199 +198 @@
                        source->getNode()->getVelocity().z);
           }
-
         }
         else
@@ -208 +206 @@
     }
   }
+  SoundEngine::checkError("SoundEngine::update()", __LINE__);
 }
 
@@ -309 +308 @@
   // #endif
 
-  printf ("===== SOURCECOUNT: %d\n", this->maxSourceCount);
   this->setDopplerValues(SOUND_DOPPLER_FACTOR, SOUND_DOPPLER_VELOCITY);
   this->allocateSources(this->maxSourceCount);
+  this->checkError("Allocating Sources", __LINE__);
 }
 
@@ -422 +421 @@
   };
 }
-

trunk/src/lib/sound/sound_source.cc

@@ -57 +57 @@
     SoundEngine::getInstance()->popALSource(this->sourceID);
   alSourcePlay(this->sourceID);
+  if (DEBUG >= 3)
+    SoundEngine::checkError("Play Source", __LINE__);
   this->bPlay = true;
 }
@@ -77 +79 @@
     alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
   this->bPlay = true;
+
+  if (DEBUG >= 3)
+    SoundEngine::checkError("Play Source", __LINE__);
 }
 
@@ -95 +100 @@
 {
   alSourcePause(this->sourceID);
+  if (DEBUG >= 3)
+    SoundEngine::checkError("Pause Source", __LINE__);
 }
 
@@ -103 +110 @@
 {
   alSourceRewind(this->sourceID);
+
+  if (DEBUG >= 3)
+    SoundEngine::checkError("Rewind Source", __LINE__);
 }
 
@@ -114 +124 @@
 {
   alSourcef(this->sourceID, AL_ROLLOFF_FACTOR, rolloffFactor);
+
+  if (DEBUG >= 3)
+    SoundEngine::checkError("Set Source Rolloff-factor", __LINE__);
 }
 

trunk/src/story_entities/game_world.cc

@@ -136 +136 @@
 int GameWorld::createAudioThread(void* gameWorld)
 {
-  GameWorld* gw = (GameWorld*)gameWorld;
+/*  GameWorld* gw = (GameWorld*)gameWorld;
   printf("STARTIG AUDIO THREAD\n");
   if(gw->dataTank && gw->dataTank->music != NULL)
@@ -145 +145 @@
     if(gw->dataTank && gw->dataTank->music != NULL)
       gw->dataTank->music->update();
-    SDL_Delay(5);
-  }
+    SDL_Delay(1);
+  }*/
   printf("End the AudioThread\n");
 }