diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-29 15:07:17 +0100 |
| commit | 318a778b1b5c98b79b202dc953ff2ac131371a1b (patch) | |
| tree | 52d05d9927c22842c5047a625e07eb9c92f87cdb /src/lib/subtitle_decoder.cc | |
| parent | 3802ba3df2ac27d4fabdcbd61b9ed84f6adf5627 (diff) | |
| parent | b289602176a4943233cffb75e8ccac379112420a (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index dd2558505..d20196a63 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -17,9 +17,10 @@ */ -#include <boost/shared_ptr.hpp> #include "subtitle_decoder.h" #include "subtitle_content.h" +#include <boost/shared_ptr.hpp> +#include <boost/foreach.hpp> using std::list; using std::cout; @@ -46,9 +47,9 @@ SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> ima } void -SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s) +SubtitleDecoder::text_subtitle (ContentTimePeriod period, list<dcp::SubtitleString> s) { - _decoded_text_subtitles.push_back (ContentTextSubtitle (s)); + _decoded_text_subtitles.push_back (ContentTextSubtitle (period, s)); } /** @param sp Full periods of subtitles that are showing or starting during the specified period */ |