projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial hacks to use of libdcp 1.0.
[dcpomatic.git]
/
src
/
lib
/
subtitle_decoder.cc
diff --git
a/src/lib/subtitle_decoder.cc
b/src/lib/subtitle_decoder.cc
index e5cadb7b48b4e513c3b11a7ad47babc10ecda689..ce48e661967f312e21a5abb3def5d25924a0d4b2 100644
(file)
--- a/
src/lib/subtitle_decoder.cc
+++ b/
src/lib/subtitle_decoder.cc
@@
-41,7
+41,7
@@
SubtitleDecoder::image_subtitle (shared_ptr<Image> image, dcpomatic::Rect<double
}
void
}
void
-SubtitleDecoder::text_subtitle (list<
libdcp::Subtitle
> s)
+SubtitleDecoder::text_subtitle (list<
dcp::SubtitleString
> s)
{
_pending.push_back (shared_ptr<DecodedTextSubtitle> (new DecodedTextSubtitle (s)));
}
{
_pending.push_back (shared_ptr<DecodedTextSubtitle> (new DecodedTextSubtitle (s)));
}