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

Timestamp:

Dec 7, 2005, 5:17:06 PM (19 years ago)

Author:

hdavid

Message:

branches/avi_play: some changes

Location:

branches/avi_play/src/lib

Files:

• graphics/importer/media_container.cc (modified) (2 diffs)
• graphics/importer/media_container.h (modified) (1 diff)
• sound/sound_engine.cc (modified) (1 diff)

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

@@ -34 +34 @@
 MediaContainer::MediaContainer(const char* filename)
 {
+  /* set the class id for the base object */
+  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
+
   /* register all formats and codecs */
   av_register_all();
 
-  if (fileName != NULL)
+  if (filename != NULL)
     this->loadMedia(filename);
 
@@ -60 +63 @@
 }
 
-void MediaContainer::loadMedia(char* filename)
+void MediaContainer::loadMedia(const char* filename)
 {
+  /* Open video file */
+  if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
+    PRINTF(1)("Could not open %s\n", filename);
 
 }

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

@@ -48 +48 @@
         GLuint getFrame(int frame_number);
         GLuint getNextFrame();
-        void loadMedia(char* filename);
+        void loadMedia(const char* filename);
         
         int getHeight();

branches/avi_play/src/lib/sound/sound_engine.cc

@@ -290 +290 @@
   // INITIALIZING THE DEVICE:
 #ifndef AL_VERSION_1_1
-  ALubyte deviceName[] =
+  ALCchar deviceName[] =
 #else
   ALCchar deviceName[] =