summaryrefslogtreecommitdiff
path: root/src/lib/dcp_encoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-19 19:58:30 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-19 23:45:23 +0100
commitae95d9cab28e414245e15ddeae20e96735594a8b (patch)
treedf35ddb480ee9aa7a34ff9831e2a3ee147a86fe7 /src/lib/dcp_encoder.h
parent507a389e9c5f84ec1d51e7566e38fbf42f658537 (diff)
Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.
Diffstat (limited to 'src/lib/dcp_encoder.h')
-rw-r--r--src/lib/dcp_encoder.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/dcp_encoder.h b/src/lib/dcp_encoder.h
index 15f3dbc64..7fbb076f3 100644
--- a/src/lib/dcp_encoder.h
+++ b/src/lib/dcp_encoder.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
@@ -19,7 +19,7 @@
*/
#include "types.h"
-#include "player_subtitles.h"
+#include "player_text.h"
#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 subtitle (PlayerSubtitles, DCPTimePeriod);
+ void subtitle (PlayerText, DCPTimePeriod);
boost::shared_ptr<Writer> _writer;
boost::shared_ptr<J2KEncoder> _j2k_encoder;