summaryrefslogtreecommitdiff
path: root/src/lib/text_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-05-31 21:02:42 +0200
committerCarl Hetherington <cth@carlh.net>2022-06-07 17:01:06 +0200
commit2975fa5cd5dcfaa806b07ef39c8900e07f417658 (patch)
treefdf2b84ad053a61882afec14a6fbd16fbd1a4493 /src/lib/text_decoder.cc
parent9b92e596727bcbab5df68ed72ddf59702a4a9702 (diff)
Switch some list -> vector for consistency.
Diffstat (limited to 'src/lib/text_decoder.cc')
-rw-r--r--src/lib/text_decoder.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/text_decoder.cc b/src/lib/text_decoder.cc
index d5afb555d..776e39c78 100644
--- a/src/lib/text_decoder.cc
+++ b/src/lib/text_decoder.cc
@@ -19,22 +19,22 @@
*/
-#include "text_decoder.h"
+#include "compose.hpp"
+#include "log.h"
#include "text_content.h"
+#include "text_decoder.h"
#include "util.h"
-#include "log.h"
-#include "compose.hpp"
#include <sub/subtitle.h>
#include <boost/algorithm/string.hpp>
#include <iostream>
-using std::list;
using std::cout;
-using std::string;
-using std::min;
using std::max;
+using std::min;
using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::optional;
using namespace dcpomatic;
@@ -68,7 +68,7 @@ TextDecoder::emit_bitmap_start (ContentBitmapText const& bitmap)
void
-TextDecoder::emit_plain_start (ContentTime from, list<dcp::SubtitleString> s)
+TextDecoder::emit_plain_start (ContentTime from, vector<dcp::SubtitleString> s)
{
for (auto& i: s) {
/* We must escape some things, otherwise they might confuse our subtitle
@@ -130,7 +130,7 @@ TextDecoder::emit_plain_start (ContentTime from, sub::Subtitle const & subtitle)
}
}
- list<dcp::SubtitleString> out;
+ vector<dcp::SubtitleString> out;
for (auto i: subtitle.lines) {
for (auto j: i.blocks) {
@@ -266,7 +266,7 @@ TextDecoder::emit_stop (ContentTime to)
void
-TextDecoder::emit_plain (ContentTimePeriod period, list<dcp::SubtitleString> s)
+TextDecoder::emit_plain (ContentTimePeriod period, vector<dcp::SubtitleString> s)
{
emit_plain_start (period.from, s);
emit_stop (period.to);