From 2975fa5cd5dcfaa806b07ef39c8900e07f417658 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 31 May 2022 21:02:42 +0200
Subject: [PATCH] Switch some list -> vector for consistency.

---
 src/lib/content_text.h          |  6 +++---
 src/lib/dcp_decoder.cc          |  2 +-
 src/lib/dcp_subtitle_decoder.cc |  4 ++--
 src/lib/text_decoder.cc         | 18 +++++++++---------
 src/lib/text_decoder.h          |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/lib/content_text.h b/src/lib/content_text.h
index d32e880ee..cd9d34bf9 100644
--- a/src/lib/content_text.h
+++ b/src/lib/content_text.h
@@ -28,7 +28,7 @@
 #include "rect.h"
 #include "types.h"
 #include <dcp/subtitle_string.h>
-#include <list>
+#include <vector>
 
 
 class Image;
@@ -74,12 +74,12 @@ public:
 class ContentStringText : public ContentText
 {
 public:
-	ContentStringText (dcpomatic::ContentTime f, std::list<dcp::SubtitleString> s)
+	ContentStringText (dcpomatic::ContentTime f, std::vector<dcp::SubtitleString> s)
 		: ContentText (f)
 		, subs (s)
 	{}
 
-	std::list<dcp::SubtitleString> subs;
+	std::vector<dcp::SubtitleString> subs;
 };
 
 
diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 542a8ff7c..dfbef3406 100644
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -288,7 +288,7 @@ DCPDecoder::pass_texts (
 			true
 			);
 
-		list<dcp::SubtitleString> strings;
+		vector<dcp::SubtitleString> strings;
 
 		for (auto i: subs) {
 			auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index d5cbabf1b..940c8c75a 100644
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -118,8 +118,8 @@ DCPSubtitleDecoder::pass ()
 	   time of emitting the first.
 	*/
 
-	list<dcp::SubtitleString> s;
-	list<dcp::SubtitleImage> i;
+	vector<dcp::SubtitleString> s;
+	vector<dcp::SubtitleImage> i;
 	auto const p = content_time_period (*_next);
 
 	while (_next != _subtitles.end () && content_time_period (*_next) == p) {
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);
diff --git a/src/lib/text_decoder.h b/src/lib/text_decoder.h
index 96b335de1..607d9e194 100644
--- a/src/lib/text_decoder.h
+++ b/src/lib/text_decoder.h
@@ -54,9 +54,9 @@ public:
 
 	void emit_bitmap_start (ContentBitmapText const& bitmap);
 	void emit_bitmap (dcpomatic::ContentTimePeriod period, std::shared_ptr<const Image> image, dcpomatic::Rect<double> rect);
-	void emit_plain_start (dcpomatic::ContentTime from, std::list<dcp::SubtitleString> s);
+	void emit_plain_start (dcpomatic::ContentTime from, std::vector<dcp::SubtitleString> s);
 	void emit_plain_start (dcpomatic::ContentTime from, sub::Subtitle const & subtitle);
-	void emit_plain (dcpomatic::ContentTimePeriod period, std::list<dcp::SubtitleString> s);
+	void emit_plain (dcpomatic::ContentTimePeriod period, std::vector<dcp::SubtitleString> s);
 	void emit_plain (dcpomatic::ContentTimePeriod period, sub::Subtitle const & subtitle);
 	void emit_stop (dcpomatic::ContentTime to);
 
-- 
2.30.2