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 38792197243a0bb4adc02ae1c9761ec25ef6d30d..3ccd5695eea0c30ffe90cd9ff8e1641dc36b3362 100644
(file)
--- a/
src/lib/dcp_encoder.h
+++ b/
src/lib/dcp_encoder.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
7
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-19,7
+19,8
@@
*/
#include "types.h"
*/
#include "types.h"
-#include "player_subtitles.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>
@@
-36,6
+37,7
@@
class DCPEncoder : public Encoder
{
public:
DCPEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job);
{
public:
DCPEncoder (boost::shared_ptr<const Film> film, boost::weak_ptr<Job> job);
+ ~DCPEncoder ();
void go ();
void go ();
@@
-51,10
+53,14
@@
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
subtitle (PlayerSubtitles
, DCPTimePeriod);
+ void
text (PlayerText, TextType, boost::optional<DCPTextTrack>
, DCPTimePeriod);
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;
bool _finishing;
bool _non_burnt_subtitles;
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;
bool _finishing;
bool _non_burnt_subtitles;
+
+ boost::signals2::scoped_connection _player_video_connection;
+ boost::signals2::scoped_connection _player_audio_connection;
+ boost::signals2::scoped_connection _player_text_connection;
};
};