Changeset 9833 in orxonox.OLD for branches/new_class_id/src/lib/graphics/importer/media_container.cc
- Timestamp:
- Sep 26, 2006, 4:59:49 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/new_class_id/src/lib/graphics/importer/media_container.cc
r9715 r9833 25 25 #include "media_container.h" 26 26 27 #include "util/loading/resource_manager.h" 28 27 #include "util/loading/new_resource_manager.h" 29 28 /* header for debug output */ 30 29 #include "debug.h" … … 92 91 return false; 93 92 // check whether file exists 94 if(!Resource Manager::isInDataDir(filename))93 if(!Resources::NewResourceManager::getInstance()->checkFileInMainPath(filename)) 95 94 { 96 95 PRINTF(1)("Could not find %s\n", filename.c_str()); … … 102 101 103 102 // Open video file 104 if (av_open_input_file(&format_context, Resource Manager::getFullName(filename).c_str(), NULL, 0, NULL) !=0 )105 { 106 PRINTF(1)("Could not open %s\n", Resource Manager::getFullName(filename).c_str());103 if (av_open_input_file(&format_context, Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str(), NULL, 0, NULL) !=0 ) 104 { 105 PRINTF(1)("Could not open %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 107 106 return false; 108 107 } … … 111 110 if (av_find_stream_info(format_context) < 0) 112 111 { 113 PRINTF(1)("Could not find stream information in %s\n", Resource Manager::getFullName(filename).c_str());112 PRINTF(1)("Could not find stream information in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 114 113 return false; 115 114 } … … 120 119 if(video_stream == -1) 121 120 { 122 PRINTF(1)("Could not find a video stream in %s\n", Resource Manager::getFullName(filename).c_str());121 PRINTF(1)("Could not find a video stream in %s\n", Resources::NewResourceManager::getInstance()->prependAbsoluteMainPath(filename).c_str()); 123 122 return false; 124 123 }
Note: See TracChangeset
for help on using the changeset viewer.