diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-10-08 23:29:32 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-10-09 20:04:33 +0200 |
| commit | 68798e3ed491d642bb52e3d70dbe9c204aeb614b (patch) | |
| tree | bd8be35b3caf3b3516f792dcea1af4e1544a504e /src/lib/string_text_file_decoder.cc | |
| parent | f14a056d70af376ef6d9171474781d3526be4cd9 (diff) | |
Cleanup some unused using statements and other bits.
Diffstat (limited to 'src/lib/string_text_file_decoder.cc')
| -rw-r--r-- | src/lib/string_text_file_decoder.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/lib/string_text_file_decoder.cc b/src/lib/string_text_file_decoder.cc index f24147851..d366bedc0 100644 --- a/src/lib/string_text_file_decoder.cc +++ b/src/lib/string_text_file_decoder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net> + Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "string_text_file_decoder.h" #include "string_text_file_content.h" #include "text_content.h" @@ -25,16 +26,15 @@ #include <dcp/subtitle_string.h> #include <iostream> -using std::list; -using std::vector; -using std::string; + using std::cout; -using std::max; +using std::make_shared; using std::shared_ptr; -using boost::optional; -using std::dynamic_pointer_cast; +using std::string; +using std::vector; using namespace dcpomatic; + StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content) : Decoder (film) , StringTextFile (content) @@ -44,9 +44,10 @@ StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, share if (!_subtitles.empty()) { first = content_time_period(_subtitles[0]).from; } - text.push_back (shared_ptr<TextDecoder> (new TextDecoder (this, content->only_text(), first))); + text.push_back (make_shared<TextDecoder>(this, content->only_text(), first)); } + void StringTextFileDecoder::seek (ContentTime time, bool accurate) { @@ -66,6 +67,7 @@ StringTextFileDecoder::seek (ContentTime time, bool accurate) } } + bool StringTextFileDecoder::pass () { @@ -80,6 +82,7 @@ StringTextFileDecoder::pass () return false; } + ContentTimePeriod StringTextFileDecoder::content_time_period (sub::Subtitle s) const { |