Changeset 7304 in orxonox.OLD for trunk/src/story_entities

Timestamp:

Apr 16, 2006, 8:27:32 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: moved the AudioThread completely to the OggPlayer. This cleans out the unnecesary overFULLNESS from game_world

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (6 diffs)
• game_world.h (modified) (3 diffs)

trunk/src/story_entities/game_world.cc

@@ -89 +89 @@
 
   this->dataXML = NULL;
-
-  this->audioThread = NULL;
 }
 
@@ -134 +132 @@
 }
 
-int GameWorld::createAudioThread(void* gameWorld)
-{
-  GameWorld* gw = (GameWorld*)gameWorld;
-  printf("STARTIG AUDIO THREAD\n");
-  if(gw->dataTank && gw->dataTank->music != NULL)
-    gw->dataTank->music->playback();
-
-  while (gw->bRunning)
-  {
-    if(gw->dataTank && gw->dataTank->music != NULL)
-      gw->dataTank->music->update();
-    SDL_Delay(1);
-  }
-  printf("End the AudioThread\n");
-}
 
 /**
@@ -204 +187 @@
   PRINTF(3)("GameWorld::~GameWorld() - unloading the current GameWorld\n");
 
-  if (this->audioThread != NULL)
-  {
-    this->bRunning = false;
-    SDL_WaitThread(this->audioThread, NULL);
-    this->audioThread = NULL;
-  }
-
   this->dataTank->unloadData();
 
@@ -227 +203 @@
   this->bRunning = true;
 
-  if (this->audioThread == NULL)
-    this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
-
   this->run();
 }
@@ -241 +214 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
-
-  if (this->audioThread != NULL)
-  {
-    this->bRunning = false;
-    SDL_WaitThread(this->audioThread, NULL);
-    this->audioThread = NULL;
-  }
-
-  this->audioThread = NULL;
 }
 
@@ -288 +252 @@
   this->dtS = 0.0f;
   this->lastFrame = SDL_GetTicks ();
+
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->play();
 
   while( this->bRunning) /* @todo implement pause */

trunk/src/story_entities/game_world.h

@@ -10 +10 @@
 #include "story_entity.h"
 #include "game_world_data.h"
-
-#include <SDL_thread.h>
 
 class Shell;
@@ -56 +54 @@
     static void toggleBVVisibility();
 
-    static int createAudioThread(void* GameWorld);
-
-
     inline void setSky(WorldEntity* sky) { this->dataTank->sky = sky; }
 
@@ -80 +75 @@
 
   protected:
-    SDL_Thread*         audioThread;
     GameWorldData*      dataTank;                     //!< reference to the GameWorld Data Tank
     TiXmlElement*       dataXML;                      //!< The XML-Element this World has been loaded with.