#include "rect.h"
#include "types.h"
#include <dcp/subtitle_string.h>
-#include <list>
+#include <vector>
class Image;
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;
};
true
);
- list<dcp::SubtitleString> strings;
+ vector<dcp::SubtitleString> strings;
for (auto i: subs) {
auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
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) {
*/
-#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);
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);