Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/movie_player.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/graphics/importer/movie_player.cc (modified) (6 diffs)

trunk/src/lib/graphics/importer/movie_player.cc

@@ -24 +24 @@
 // include your own header
 #include "movie_player.h"
-
 #include "util/loading/resource_manager.h"
 
@@ -30 +29 @@
 #include "debug.h"
 
+ObjectListDefinition(MoviePlayer);
 
 MoviePlayer::MoviePlayer(const std::string& filename)
 {
   // set the class id for the base object
-  this->setClassID(CL_MOVIE_PLAYER, "MoviePlayer");
-
+  this->registerObject(this, MoviePlayer::_objectList);
   status = STOP;
   timer = 0;
@@ -90 +89 @@
     return false;
   // check whether file exists
-  if(!ResourceManager::isInDataDir(filename))
+  if(!Resources::ResourceManager::getInstance()->checkFileInMainPath(filename))
   {
     PRINTF(1)("Could not find %s\n", filename.c_str());
@@ -100 +99 @@
 
   // Open video file
-  if (av_open_input_file(&format_context, ResourceManager::getFullName(filename).c_str(), NULL, 0, NULL) !=0 )
-  {
-    PRINTF(1)("Could not open %s\n", ResourceManager::getFullName(filename).c_str());
+  if (av_open_input_file(&format_context, Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str(), NULL, 0, NULL) !=0 )
+  {
+    PRINTF(1)("Could not open %s\n", Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
     return false;
   }
@@ -109 +108 @@
   if (av_find_stream_info(format_context) < 0)
   {
-    PRINTF(1)("Could not find stream information in %s\n", ResourceManager::getFullName(filename).c_str());
+    PRINTF(1)("Could not find stream information in %s\n", Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
     return false;
   }
@@ -118 +117 @@
   if(video_stream == -1)
   {
-    PRINTF(1)("Could not find a video stream in %s\n", ResourceManager::getFullName(filename).c_str());
+    PRINTF(1)("Could not find a video stream in %s\n", Resources::ResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str());
     return false;
   }