Changeset 6510 in orxonox.OLD for branches/avi_play/src/lib

Timestamp:

Jan 16, 2006, 4:29:04 PM (18 years ago)

Author:

hdavid

Message:

branches/avi_play: fixed loading

Location:

branches/avi_play/src/lib/graphics/importer

Files:

• media_container.cc (modified) (4 diffs)
• movie_player.cc (modified) (4 diffs)

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

@@ -25 +25 @@
 #include "media_container.h"
 
+#include "resource_manager.h"
+
 /* header for debug output */
 #include "debug.h"
@@ -82 +84 @@
 
   // Open video file
-  if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
-  {
-    PRINTF(1)("Could not open %s\n", filename);
+  if (av_open_input_file(&format_context, ResourceManager::getFullName(filename), NULL, 0, NULL) !=0 )
+  {
+    PRINTF(1)("Could not open %s\n", ResourceManager::getFullName(filename));
     return false;
   }
@@ -91 +93 @@
   if (av_find_stream_info(format_context) < 0)
   {
-    PRINTF(1)("Could not find stream information in %s\n", filename);
+    PRINTF(1)("Could not find stream information in %s\n", ResourceManager::getFullName(filename));
     return false;
   }
@@ -100 +102 @@
   if(video_stream == -1)
   {
-    PRINTF(1)("Could not find a video stream in %s\n", filename);
+    PRINTF(1)("Could not find a video stream in %s\n", ResourceManager::getFullName(filename));
     return false;
   }
 
   // Get a pointer to the codec context for the video stream
-  // NOTE: different code for the 0.4.9-pre1 release of ffmpeg (tardis)
-  // codec_context = &format_context->streams[video_stream]->codec;
   codec_context = format_context->streams[video_stream]->codec;
 

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

@@ -25 +25 @@
 #include "movie_player.h"
 
+#include "resource_manager.h"
+
 // header for debug output
 #include "debug.h"
@@ -96 +98 @@
 
   // Open video file
-  if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
-  {
-    PRINTF(1)("Could not open %s\n", filename);
+  if (av_open_input_file(&format_context, ResourceManager::getFullName(filename), NULL, 0, NULL) !=0 )
+  {
+    PRINTF(1)("Could not open %s\n", ResourceManager::getFullName(filename));
     return false;
   }
@@ -105 +107 @@
   if (av_find_stream_info(format_context) < 0)
   {
-    PRINTF(1)("Could not find stream information in %s\n", filename);
+    PRINTF(1)("Could not find stream information in %s\n", ResourceManager::getFullName(filename));
     return false;
   }
@@ -114 +116 @@
   if(video_stream == -1)
   {
-    PRINTF(1)("Could not find a video stream in %s\n", filename);
+    PRINTF(1)("Could not find a video stream in %s\n", ResourceManager::getFullName(filename));
     return false;
   }