Changeset 6321 in orxonox.OLD

Timestamp:

Dec 27, 2005, 5:05:17 PM (18 years ago)

Author:

stefalie

Message:

branches/avi_play: controls should know work for the movie_player

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/movie_player.cc (modified) (4 diffs)
• subprojects/importer/movie_player_test.cc (modified) (2 diffs)

branches/avi_play/src/lib/graphics/importer/movie_player.cc

@@ -82 +82 @@
 void MoviePlayer::start(unsigned int start_frame)
 {
-  if(status == STOP)
-    //that'd probably do its job if getFrame worked
-    texture = media_container->getFrame(3);
+  if(start_frame < 2)
+    texture = media_container->getFrame(2);
+  else
+    texture = media_container->getFrame(start_frame);
   status = PLAY;
 }
@@ -90 +91 @@
 void MoviePlayer::resume()
 {
-  if(status != STOP)
-    status = PLAY;
+  if(status == STOP)
+    texture = media_container->getFrame(2);
+  status = PLAY;
 }
 
 void MoviePlayer::pause()
 {
-  status = PAUSE;
+  if(status != STOP)
+    status = PAUSE;
 }
 
@@ -102 +105 @@
 {
   status = STOP;
+  texture = NULL;
 }
 
@@ -107 +111 @@
 {
   if(status == PLAY)
+  {
     texture = media_container->getNextFrame();
+    if(texture == NULL)
+      status = STOP;
+  }
 }
 

branches/avi_play/src/subprojects/importer/movie_player_test.cc

@@ -38 +38 @@
       {
         case SDLK_1:
+          movie_player->start(0);
+          PRINTF(0)("Start\n");
+          break;
+        case SDLK_2:
           movie_player->resume();
           PRINTF(0)("Play-/Resuming\n");
           break;
-        case SDLK_2:
+        case SDLK_3:
           movie_player->pause();
           PRINTF(0)("Pause\n");
           break;
-        case SDLK_3:
+        case SDLK_4:
           movie_player->stop();
           PRINTF(0)("Stopped\n");
@@ -56 +60 @@
 {
   movie_player->tick(dt);
+
+  PRINTF(1)("Status %i\n", movie_player->getStatus());
 }