summaryrefslogtreecommitdiff
path: root/src/lib/transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-11-28 23:45:34 +0000
committerCarl Hetherington <cth@carlh.net>2017-04-19 23:04:32 +0100
commita78b741c43830c84bcb4d18e3147746f13a668e5 (patch)
tree170fdc1a80f397ccb6c2e9454a7a106448358dda /src/lib/transcoder.cc
parent3d90ce7a500a33b6147c30b65766efcbc447f5ab (diff)
Attempt to tidy up internal APIs slightly.
Diffstat (limited to 'src/lib/transcoder.cc')
-rw-r--r--src/lib/transcoder.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index da6b08c5f..de2fb1d33 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -63,9 +63,9 @@ Transcoder::Transcoder (shared_ptr<const Film> film, weak_ptr<Job> j)
, _finishing (false)
, _non_burnt_subtitles (false)
{
- _player->Video.connect (bind (&Transcoder::video, this, _1));
+ _player->Video.connect (bind (&Transcoder::video, this, _1, _2));
_player->Audio.connect (bind (&Transcoder::audio, this, _1, _2));
- _player->Subtitle.connect (bind (&Transcoder::subtitle, this, _1));
+ _player->Subtitle.connect (bind (&Transcoder::subtitle, this, _1, _2));
BOOST_FOREACH (shared_ptr<const Content> c, _film->content ()) {
if (c->subtitle && c->subtitle->use() && !c->subtitle->burn()) {
@@ -102,14 +102,14 @@ Transcoder::go ()
}
void
-Transcoder::video (shared_ptr<PlayerVideo> data)
+Transcoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
{
if (!_film->three_d() && data->eyes() == EYES_LEFT) {
/* Use left-eye images for both eyes */
data->set_eyes (EYES_BOTH);
}
- _encoder->encode (data);
+ _encoder->encode (data, time);
}
void
@@ -123,10 +123,10 @@ Transcoder::audio (shared_ptr<AudioBuffers> data, DCPTime time)
}
void
-Transcoder::subtitle (PlayerSubtitles data)
+Transcoder::subtitle (PlayerSubtitles data, DCPTimePeriod period)
{
if (_non_burnt_subtitles) {
- _writer->write (data);
+ _writer->write (data, period);
}
}