Changeset 6711 in orxonox.OLD for branches/avi_play/src/lib/graphics/importer/movie_player.cc

Timestamp:

Jan 25, 2006, 4:18:25 PM (18 years ago)

Author:

hdavid

Message:

branches/avi_play: safe

File:

• branches/avi_play/src/lib/graphics/importer/movie_player.cc (modified) (5 diffs)

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

@@ -33 +33 @@
 MoviePlayer::MoviePlayer(const char* filename)
 {
-  this->init();
-
-  if (filename != NULL)
-  {
-    if(!this->loadMovie(filename))
-      PRINTF(1)("MoviePlayer::loadMovie() failes for %s\n", filename);
-  }
-}
-
-MoviePlayer::MoviePlayer()
-{
-  this->init();
-}
+  // set the class id for the base object
+  this->setClassID(CL_MOVIE_PLAYER, "MoviePlayer");
+
+  status = STOP;
+  timer = 0;
+  frame_number = 0;
+
+  mediaLoaded = false;
+
+  this->loadMovie(filename);
+
+}
+
 
 MoviePlayer::~MoviePlayer()
 {
-  //delete material;
-  //delete model;
+  this->unloadMedia();
+}
+
+void MoviePlayer::unloadMedia()
+{
+  // check whether a movie is already loaded
+  if(!mediaLoaded)
+    return;
 
   if (glIsTexture(texture))
@@ -67 +73 @@
   // Close the video file
   av_close_input_file(format_context);
-}
-
-void MoviePlayer::init()
-{
-  // set the class id for the base object
-  this->setClassID(CL_MOVIE_PLAYER, "MoviePlayer");
 
   status = STOP;
   timer = 0;
   frame_number = 0;
-  loading = false;
-}
+
+  mediaLoaded = false;
+
+}
+
 
 bool MoviePlayer::loadMovie(const char* filename)
 {
+  this->unloadMedia();
+
+  if(filename == NULL)
+    return false;
+  // check whether file exists
+  if(!ResourceManager::isInDataDir(filename))
+  {
+    PRINTF(1)("Could not find %s\n", filename);
+    return false;
+  }
+
   // register all formats and codecs
   av_register_all();
@@ -164 +178 @@
   glBindTexture(GL_TEXTURE_2D, 0);
 
-  loading = true;
+  mediaLoaded = true;
   return true;
 }
@@ -264 +278 @@
 bool MoviePlayer::gotoFrame(int frames)
 {
-  if(!loading)
+  if(!mediaLoaded)
   {
     PRINTF(0)("Load first the media file with loadMovie\n");
@@ -390 +404 @@
 void MoviePlayer::printInformation()
 {
-  if(!loading)
+  if(!mediaLoaded)
   {
     PRINTF(0)("Load first the media file with loadMovie\n");