Changeset 6704 in orxonox.OLD

Timestamp:

Jan 25, 2006, 3:18:45 PM (18 years ago)

Author:

hdavid

Message:

branches/avi_play: MediaContainer is dummy-safe

Location:

branches/avi_play/src

Files:

• lib/graphics/importer/media_container.cc (modified) (5 diffs)
• lib/graphics/importer/media_container.h (modified) (2 diffs)
• world_entities/movie_entity.cc (modified) (5 diffs)
• world_entities/movie_entity.h (modified) (1 diff)

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

@@ -40 +40 @@
 
   fps = 0;
-
-  if (filename != NULL)
-  {
-    if(!this->loadMedia(filename))
-      PRINTF(1)("MediaContainer::loadMedia() failed for %s\n", filename);
-  }
+  mediaLoaded = false;
+
+  this->loadMedia(filename);
 }
 
@@ -54 +51 @@
 
   fps = 0;
+  mediaLoaded = false;
 }
 
@@ -61 +59 @@
 MediaContainer::~MediaContainer()
 {
+  this->unloadMedia();
+}
+
+void MediaContainer::unloadMedia()
+{
+  // check whether a movie is already loaded
+  if(!mediaLoaded)
+    return;
+
+  fps = 0;
+
+  // clear texturelist
+  this->clearLists();
+
   if (glIsTexture(texture))
-    glDeleteTextures(1, &texture);
+  glDeleteTextures(1, &texture);
 
   // Free the RGB image
@@ -76 +88 @@
   // Close the video file
   av_close_input_file(format_context);
+
+  mediaLoaded = false;
+
 }
 
 bool MediaContainer::loadMedia(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();
@@ -146 +174 @@
   // read the frames and save them in a sequence as textures
   this->loadFrames();
+  mediaLoaded = true;
 
   return true;

branches/avi_play/src/lib/graphics/importer/media_container.h

@@ -40 +40 @@
   int video_stream;
   double fps;
+  bool mediaLoaded;
 
 public:
@@ -55 +56 @@
   
   GLuint getNextFrame();
-
+  void unloadMedia();
 };
 

branches/avi_play/src/world_entities/movie_entity.cc

@@ -40 +40 @@
   height = 20;
   width = 20;
+  mediaLoaded = false;
 
   this->toList(OM_COMMON);
@@ -64 +65 @@
   LoadParam(root, "name", this, MovieEntity, loadMovie);
   LoadParam(root, "axis", this, MovieEntity, setAxis);
-  LoadParam(root, "rotation", this, MovieEntity, setRotation);
+  //LoadParam(root, "rotation", this, MovieEntity, setRotation);
   LoadParam(root, "size", this, MovieEntity, setSize);
 }
@@ -70 +71 @@
 void MovieEntity::loadMovie(const char* filename)
 {
-  media_container->loadMedia(filename);
+  if(media_container->loadMedia(filename))
+    mediaLoaded = true;
+  else
+    mediaLoaded = false;
 }
 
@@ -98 +102 @@
 void MovieEntity::tick(float time)
 {
+  if(!mediaLoaded)
+    return;
+
   timer += time;
 
@@ -123 +130 @@
 void MovieEntity::draw() const
 {
+  if(!mediaLoaded)
+    false;
 
   glPushMatrix();

branches/avi_play/src/world_entities/movie_entity.h

@@ -26 +26 @@
     float width;
 
+    bool mediaLoaded;
+
   public:
     MovieEntity (const TiXmlElement* root = NULL);