*/
-#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;
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
}
}
- list<dcp::SubtitleString> out;
+ vector<dcp::SubtitleString> out;
for (auto i: subtitle.lines) {
for (auto j: i.blocks) {
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);