mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-19 10:09:43 +00:00
Code Issues Releases Wiki Activity

namespace fix, improve comment

Browse source
This commit is contained in:
scrawl 2014-10-22 23:22:22 +02:00
parent 9da1c49276
commit a9be8628b9
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extern/ogre-ffmpeg-videoplayer/videodefs.hpp vendored
View file

@ -1,6 +1,9 @@
#ifndef VIDEOPLAYER_DEFS_H #ifndef VIDEOPLAYER_DEFS_H
#define VIDEOPLAYER_DEFS_H #define VIDEOPLAYER_DEFS_H
namespace Video
{
enum { enum {
AV_SYNC_AUDIO_MASTER, // Play audio with no frame drops, sync video to audio AV_SYNC_AUDIO_MASTER, // Play audio with no frame drops, sync video to audio
AV_SYNC_VIDEO_MASTER, // Play video with no frame drops, sync audio to video AV_SYNC_VIDEO_MASTER, // Play video with no frame drops, sync audio to video
@ -9,4 +12,6 @@ enum {
AV_SYNC_DEFAULT = AV_SYNC_EXTERNAL_MASTER AV_SYNC_DEFAULT = AV_SYNC_EXTERNAL_MASTER
}; };
}
#endif #endif

6
extern/ogre-ffmpeg-videoplayer/videoplayer.hpp vendored
View file

@ -4,13 +4,10 @@
#include <string> #include <string>
#include <memory> #include <memory>
#include <boost/shared_ptr.hpp>
namespace Video namespace Video
{ {
struct VideoState; struct VideoState;
class MovieAudioDecoder;
class MovieAudioFactory; class MovieAudioFactory;
/** /**
@ -22,6 +19,9 @@ namespace Video
VideoPlayer(); VideoPlayer();
~VideoPlayer(); ~VideoPlayer();
/// @brief Set the MovieAudioFactory to use.
/// @par This class must be implemented by the user and is responsible for reading the decoded audio data.
/// @note If you do not set up a MovieAudioFactory, then audio streams will be ignored and the video will be played with no sound.
/// @note Takes ownership of the passed pointer. /// @note Takes ownership of the passed pointer.
void setAudioFactory (MovieAudioFactory* factory); void setAudioFactory (MovieAudioFactory* factory);