projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
White space.
[dcpomatic.git]
/
src
/
lib
/
reel_writer.cc
diff --git
a/src/lib/reel_writer.cc
b/src/lib/reel_writer.cc
index 7b9ea09bf469cc03e003099c00346bc17047752b..44da409a126f99ab07cba60253da7b882a9c5a88 100644
(file)
--- a/
src/lib/reel_writer.cc
+++ b/
src/lib/reel_writer.cc
@@
-440,6
+440,10
@@
ReelWriter::finish (boost::filesystem::path output_dcp)
}
}
}
}
+
+/** Try to make a ReelAsset for a subtitles or closed captions in a given period in the DCP.
+ * A SubtitleAsset can be provided, or we will use one from @ref refs if not.
+ */
template <class Interop, class SMPTE, class Result>
shared_ptr<Result>
maybe_add_text (
template <class Interop, class SMPTE, class Result>
shared_ptr<Result>
maybe_add_text (
@@
-681,7
+685,6
@@
ReelWriter::create_reel_text (
}
}
-
void
ReelWriter::create_reel_markers (shared_ptr<dcp::Reel> reel) const
{
void
ReelWriter::create_reel_markers (shared_ptr<dcp::Reel> reel) const
{