Changeset 7283 in orxonox.OLD for trunk

Timestamp:

Apr 13, 2006, 7:15:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: thread for audio, and 'is' to 'b'

Location:

trunk/src/story_entities

Files:

• campaign.cc (modified) (5 diffs)
• game_world.cc (modified) (10 diffs)
• game_world.h (modified) (3 diffs)
• movie_loader.cc (modified) (4 diffs)
• story_entity.cc (modified) (1 diff)
• story_entity.h (modified) (2 diffs)

trunk/src/story_entities/campaign.cc

@@ -79 +79 @@
   PRINTF(2)("Starting Campaign nr. %i\n", this->getStoryID());
 
-  this->isRunning = true;
+  this->bRunning = true;
   this->bReturnToMenu = false;
   this->run();
@@ -90 +90 @@
 bool Campaign::pause()
 {
-  this->isPaused = true;
+  this->bPaused = true;
 }
 
@@ -100 +100 @@
 {
   PRINTF(4)("Resuming the current Campaign\n");
-  this->isPaused = false;
+  this->bPaused = false;
 }
 
@@ -113 +113 @@
     this->bReturnToMenu = true;
   else
-    this->isRunning = false;  // fast exit
+    this->bRunning = false;  // fast exit
   if( this->currentEntity != NULL)
   {
@@ -129 +129 @@
   int                storyID = WORLD_ID_0;
 
-  for( this->currentEntity = this->campaignData->getFirstLevel(), this->isRunning = true;
-       this->currentEntity != NULL && this->isRunning;
+  for( this->currentEntity = this->campaignData->getFirstLevel(), this->bRunning = true;
+       this->currentEntity != NULL && this->bRunning;
        this->currentEntity = this->campaignData->getNextLevel())
   {

trunk/src/story_entities/game_world.cc

@@ -89 +89 @@
 
   this->dataXML = NULL;
+
+  this->audioThread = NULL;
 }
 
@@ -100 +102 @@
 {
   PRINTF(4)("Deleted GameWorld\n");
+
+  if (this->audioThread != NULL)
+    SDL_KillThread(this->audioThread);
 }
 
@@ -131 +136 @@
 }
 
+int GameWorld::createAudioThread(void* gameWorld)
+{
+  GameWorld* gw = (GameWorld*)gameWorld;
+  printf("STARTIG AUDIO THREAD\n");
+  while (gw->bRunning)
+  {
+    if(gw->dataTank->music != NULL)
+      gw->dataTank->music->playback();
+    SDL_Delay(5);
+  }
+  printf("End the AudioThread\n");
+}
 
 /**
@@ -199 +216 @@
 bool GameWorld::start()
 {
-  this->isPaused = false;
-  this->isRunning = true;
+  this->bPaused = false;
+  this->bRunning = true;
+
+  if (this->audioThread == NULL)
+    this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
 
   this->run();
@@ -212 +232 @@
 {
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
-  this->isRunning = false;
+  this->bRunning = false;
+
+//  SDL_KillThread(this->audioThread);
+  this->audioThread = NULL;
 }
 
@@ -221 +244 @@
 bool GameWorld::pause()
 {
-  this->isPaused = true;
+  this->bPaused = true;
 }
 
@@ -230 +253 @@
 bool GameWorld::resume()
 {
-  this->isPaused = false;
+  this->bPaused = false;
 }
 
@@ -243 +266 @@
 void GameWorld::run()
 {
-  /* start the music */
-  if(this->dataTank->music != NULL)
-    this->dataTank->music->playback();
-
   PRINTF(3)("GameWorld::mainLoop() - Entering main loop\n");
 
@@ -256 +275 @@
   this->lastFrame = SDL_GetTicks ();
 
-  while( this->isRunning) /* @todo implement pause */
+  while( this->bRunning) /* @todo implement pause */
   {
     /* process intput */
     this->handleInput ();
-    if( !this->isRunning)
+    if( !this->bRunning)
       break;
 
@@ -326 +345 @@
   Uint32 currentFrame = SDL_GetTicks();
 
-  if( !this->isPaused)
+  if( !this->bPaused)
   {
     // CALCULATE FRAMERATE

trunk/src/story_entities/game_world.h

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

trunk/src/story_entities/movie_loader.cc

@@ -79 +79 @@
   this->movie_player->start(0);
 
-  this->isRunning = true;
+  this->bRunning = true;
   this->run();
 }
@@ -87 +87 @@
   EventHandler::getInstance()->popState();
 
-  this->isRunning = false;
+  this->bRunning = false;
 }
 
@@ -98 +98 @@
   this->lastFrame = SDL_GetTicks ();
 
-  while( this->isRunning)
+  while( this->bRunning)
   {
     EventHandler::getInstance()->process();
@@ -146 +146 @@
 
   if (movie_player->getStatus() == STOP)
-    this->isRunning = false;
+    this->bRunning = false;
 
   this->lastFrame = currentFrame;

trunk/src/story_entities/story_entity.cc

@@ -36 +36 @@
   this->setClassID(CL_STORY_ENTITY, "StoryEntity");
 
-  this->isInit = false;
-  this->isPaused = false;
-  this->isRunning = false;
+  this->bInit = false;
+  this->bPaused = false;
+  this->bRunning = false;
 
   this->loadFile = "";

trunk/src/story_entities/story_entity.h

@@ -24 +24 @@
 
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...
-class StoryEntity : virtual public BaseObject {
+class StoryEntity : virtual public BaseObject
+{
 
- public:
+public:
   StoryEntity ();
   virtual ~StoryEntity ();
@@ -85 +86 @@
   inline const std::string& getMenuScreenshoot() { return this->menuScreenshoot; }
 
-  protected:
-    bool          isInit;            //!< if the entity is initialized, this has to be true.
-    bool          isRunning;         //!< is true if the entity is running
-    bool          isPaused;          //!< is true if the entity is paused
+protected:
+  bool          bInit;             //!< if the entity is initialized, this has to be true.
+  bool          bRunning;          //!< is true if the entity is running
+  bool          bPaused;           //!< is true if the entity is paused
 
 
- private:
-    int           storyID;          //!< this is the number of this entity, identifying it in a list/tree...
-    int           nextStoryID;      //!< if this entity has finished, this entity shall be called
-    std::string   loadFile;         //!< The file from which this world is loaded
+private:
+  int           storyID;          //!< this is the number of this entity, identifying it in a list/tree...
+  int           nextStoryID;      //!< if this entity has finished, this entity shall be called
+  std::string   loadFile;         //!< The file from which this world is loaded
 
-    std::string   description;      //!< the description of the StoryEntity
-    std::string   menuItemImage;    //!< the item image of the StoryEntity
-    std::string   menuScreenshoot;  //!< the screenshoot of the StoryEntity
-    bool          bMenuEntry;       //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific
+  std::string   description;      //!< the description of the StoryEntity
+  std::string   menuItemImage;    //!< the item image of the StoryEntity
+  std::string   menuScreenshoot;  //!< the screenshoot of the StoryEntity
+  bool          bMenuEntry;       //!< If true, this GameWorld apears in the SimpleMenu: SimpleMenu specific
 };