Changeset 6353 in orxonox.OLD for branches/avi_play/src/subprojects

Timestamp:

Dec 30, 2005, 8:34:22 PM (19 years ago)

Author:

hdavid

Message:

branches\avi_play: MoviePlayer works again

Location:

branches/avi_play/src/subprojects/importer

Files:

• movie_player_test.cc (modified) (2 diffs)
• multitex.cc (modified) (2 diffs)

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

@@ -21 +21 @@
 #include "movie_player.h"
 
-//MoviePlayer* movie_player;
+MoviePlayer* movie_player;
 
 void Framework::moduleInit(int argc, char** argv)
 {
-  //movie_player = new MoviePlayer(argv[1]);
+  movie_player = new MoviePlayer(argv[1]);
 
-  //movie_player->printInformation();
+  movie_player->printInformation();
 }
 
 void Framework::moduleEventHandler(SDL_Event* event)
 {
-  /*switch (event->type)
+  switch (event->type)
   {
     case SDL_KEYDOWN:
@@ -58 +58 @@
           break;
       }
-  }*/
+  }
 }
 
 void Framework::moduleTick(float dt)
 {
-  //movie_player->tick(dt);
+  movie_player->tick(dt);
 }
 
 void Framework::moduleDraw(void) const
 {
-  //movie_player->draw();
+  movie_player->draw();
 }
 

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

@@ -78 +78 @@
           counter = 0;
           timer = 0;
-          PRINTF(0)("total_frames: %i\n", media_container->getFrameCount());
           SDL_Delay(1000);
           break;
@@ -109 +108 @@
       counter = 0;
       PRINTF(0)("BEGIN\n");
+      PRINTF(0)("total_frames: %i\n", media_container->getFrameCount());
     }
   }