Changeset 7307 in orxonox.OLD

Timestamp:

Apr 16, 2006, 10:37:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: more compliant, less errors, this seems to be better…

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (3 diffs)
• lib/sound/ogg_player.h (modified) (1 diff)
• story_entities/game_world.cc (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -146 +146 @@
 
   this->state &= ~(OggPlayer::Stopped | OggPlayer::Paused);
+
+  if (!this->playback())
+    return false;
+
   if (this->musicThread == NULL)
     return ((this->musicThread = SDL_CreateThread(OggPlayer::createAudioThread, (void*)this)) != NULL);
@@ -231 +235 @@
   OggPlayer* ogg = (OggPlayer*)oggPlayer;
   PRINTF(4)("STARTIG AUDIO THREAD\n");
-
-  if (!ogg->playback())
-    return -1;
 
   while (ogg->state & OggPlayer::Playing)
@@ -284 +285 @@
   {
     assert (!(this->state & Playing));
+    this->printState();
     SDL_WaitThread(this->musicThread, NULL);
     this->musicThread = NULL;

trunk/src/lib/sound/ogg_player.h

@@ -76 +76 @@
   void empty();
 
-public:
-
 private:
   FILE*               oggFile;              //!< general file-handler, to open the sound-file

trunk/src/story_entities/game_world.cc

@@ -281 +281 @@
         this->dataTank->music->printState();
       }
-      if (this->cycle == 500)
+      if (this->cycle % 4 == 0)
         this->dataTank->music->pause();
-      if (this->cycle == 1000)
+      if (this->cycle % 5 == 0)
         this->dataTank->music->play();
-      if (this->cycle == 1500)
+      if (this->cycle % 11 == 0)
         this->dataTank->music->stop();
-      if (this->cycle == 2000)
-        this->dataTank->music->play();
-
-
     }
   }