projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
[dcpomatic.git]
/
src
/
lib
/
dcp_encoder.h
diff --git
a/src/lib/dcp_encoder.h
b/src/lib/dcp_encoder.h
index 850ead6568f655df4613fc2bb2986b2356d22c96..3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362 100644
(file)
--- a/
src/lib/dcp_encoder.h
+++ b/
src/lib/dcp_encoder.h
@@
-19,7
+19,8
@@
*/
#include "types.h"
*/
#include "types.h"
-#include "player_caption.h"
+#include "player_text.h"
+#include "dcp_text_track.h"
#include "encoder.h"
#include <boost/weak_ptr.hpp>
#include "encoder.h"
#include <boost/weak_ptr.hpp>
@@
-52,7
+53,7
@@
private:
void video (boost::shared_ptr<PlayerVideo>, DCPTime);
void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
void video (boost::shared_ptr<PlayerVideo>, DCPTime);
void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
- void text (Player
Caption, TextType
, DCPTimePeriod);
+ void text (Player
Text, TextType, boost::optional<DCPTextTrack>
, DCPTimePeriod);
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;