projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mostly-merge master.
[dcpomatic.git]
/
src
/
lib
/
types.h
diff --git
a/src/lib/types.h
b/src/lib/types.h
index 42344cae543b8d380a5ccdc275b53816c4e79a69..4e1f59ca87fb122baea9acad6c63b71f5e83061d 100644
(file)
--- a/
src/lib/types.h
+++ b/
src/lib/types.h
@@
-24,6
+24,7
@@
#include <stdint.h>
#include <boost/shared_ptr.hpp>
#include <dcp/util.h>
#include <stdint.h>
#include <boost/shared_ptr.hpp>
#include <dcp/util.h>
+#include "dcpomatic_time.h"
class Content;
class VideoContent;
class Content;
class VideoContent;
@@
-44,27
+45,27
@@
typedef std::vector<boost::shared_ptr<AudioContent> > AudioContentList;
typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
typedef std::vector<boost::shared_ptr<SubtitleContent> > SubtitleContentList;
typedef std::vector<boost::shared_ptr<FFmpegContent> > FFmpegContentList;
-template<class T>
struct TimedAudioBuffers
{
TimedAudioBuffers ()
: time (0)
{}
struct TimedAudioBuffers
{
TimedAudioBuffers ()
: time (0)
{}
- TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a,
T
t)
+ TimedAudioBuffers (boost::shared_ptr<AudioBuffers> a,
DCPTime
t)
: audio (a)
, time (t)
{}
boost::shared_ptr<AudioBuffers> audio;
: audio (a)
, time (t)
{}
boost::shared_ptr<AudioBuffers> audio;
-
T
time;
+
DCPTime
time;
};
enum VideoFrameType
{
VIDEO_FRAME_TYPE_2D,
VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
};
enum VideoFrameType
{
VIDEO_FRAME_TYPE_2D,
VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
- VIDEO_FRAME_TYPE_3D_TOP_BOTTOM
+ VIDEO_FRAME_TYPE_3D_TOP_BOTTOM,
+ VIDEO_FRAME_TYPE_3D_ALTERNATE
};
enum Eyes
};
enum Eyes