projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up after previous commit.
[dcpomatic.git]
/
src
/
lib
/
dcp_encoder.h
diff --git
a/src/lib/dcp_encoder.h
b/src/lib/dcp_encoder.h
index 15f3dbc64ba2ff68b798dae682942426a4b5b4b6..9808987c3ce61eee7bdb9b34db8eead74590e7d1 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,7
@@
*/
#include "types.h"
*/
#include "types.h"
-#include "player_
subtitles
.h"
+#include "player_
caption
.h"
#include "encoder.h"
#include <boost/weak_ptr.hpp>
#include "encoder.h"
#include <boost/weak_ptr.hpp>
@@
-52,7
+52,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
subtitle (PlayerSubtitles
, DCPTimePeriod);
+ void
caption (PlayerCaption, CaptionType
, DCPTimePeriod);
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;
@@
-61,5
+61,5
@@
private:
boost::signals2::scoped_connection _player_video_connection;
boost::signals2::scoped_connection _player_audio_connection;
boost::signals2::scoped_connection _player_video_connection;
boost::signals2::scoped_connection _player_audio_connection;
- boost::signals2::scoped_connection _player_
subtitle
_connection;
+ boost::signals2::scoped_connection _player_
caption
_connection;
};
};