Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5975 in orxonox.OLD


Ignore:
Timestamp:
Dec 7, 2005, 5:17:06 PM (18 years ago)
Author:
hdavid
Message:

branches/avi_play: some changes

Location:
branches/avi_play/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/avi_play/src/defs/class_id.h

    r5924 r5975  
    193193  CL_MATERIAL                   =    0x00000804,
    194194  CL_TEXTURE_SEQUENCE           =    0x00c04805,
     195  CL_MEDIA_CONTAINER            =    0x00000806,
    195196  CL_OBJMODEL                   =    0x00000807,
    196197  CL_PROMITIVE_MODEL            =    0x00000808,

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

    r5962 r5975  
    3434MediaContainer::MediaContainer(const char* filename)
    3535{
     36  /* set the class id for the base object */
     37  this->setClassID(CL_MEDIA_CONTAINER, "MediaContainer");
     38
    3639  /* register all formats and codecs */
    3740  av_register_all();
    3841
    39   if (fileName != NULL)
     42  if (filename != NULL)
    4043    this->loadMedia(filename);
    4144
    … …  
    6063}
    6164
    62 void MediaContainer::loadMedia(char* filename)
     65void MediaContainer::loadMedia(const char* filename)
    6366{
     67  /* Open video file */
     68  if (av_open_input_file(&format_context, filename, NULL, 0, NULL) !=0 )
     69    PRINTF(1)("Could not open %s\n", filename);
    6470
    6571}

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

    r5962 r5975  
    4848        GLuint getFrame(int frame_number);
    4949        GLuint getNextFrame();
    50         void loadMedia(char* filename);
     50        void loadMedia(const char* filename);
    5151       
    5252        int getHeight();

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

    r5963 r5975  
    290290  // INITIALIZING THE DEVICE:
    291291#ifndef AL_VERSION_1_1
    292   ALubyte deviceName[] =
     292  ALCchar deviceName[] =
    293293#else
    294294  ALCchar deviceName[] =
Note: See TracChangeset for help on using the changeset viewer.