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
/
reel_writer.cc
diff --git
a/src/lib/reel_writer.cc
b/src/lib/reel_writer.cc
index 77d5833533373334d91507bf5db5e112442ca85d..8fb15c133c100684e3eb2c70c1041c838e346956 100644
(file)
--- a/
src/lib/reel_writer.cc
+++ b/
src/lib/reel_writer.cc
@@
-528,7
+528,7
@@
ReelWriter::write (shared_ptr<const AudioBuffers> audio)
}
void
}
void
-ReelWriter::write (PlayerCaption subs,
Text
Type type, DCPTimePeriod period)
+ReelWriter::write (PlayerCaption subs,
Caption
Type type, DCPTimePeriod period)
{
/* XXX: we need separate libdcp asset types here and to know how different they are */
{
/* XXX: we need separate libdcp asset types here and to know how different they are */
@@
-565,7
+565,7
@@
ReelWriter::write (PlayerCaption subs, TextType type, DCPTimePeriod period)
_subtitle_asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
}
_subtitle_asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
}
- BOOST_FOREACH (Bitmap
Text
i, subs.image) {
+ BOOST_FOREACH (Bitmap
Caption
i, subs.image) {
_subtitle_asset->add (
shared_ptr<dcp::Subtitle>(
new dcp::SubtitleImage(
_subtitle_asset->add (
shared_ptr<dcp::Subtitle>(
new dcp::SubtitleImage(