projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add operator* for Time and int.
[dcpomatic.git]
/
src
/
lib
/
string_text_file_decoder.cc
diff --git
a/src/lib/string_text_file_decoder.cc
b/src/lib/string_text_file_decoder.cc
index f24147851847e1ee120354984f2dbd40f20630a7..2ec0ec1cb74f10cc3f32769c378670f97204efd3 100644
(file)
--- a/
src/lib/string_text_file_decoder.cc
+++ b/
src/lib/string_text_file_decoder.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-20
18
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
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"
#include "string_text_file_decoder.h"
#include "string_text_file_content.h"
#include "text_content.h"
@@
-25,28
+26,25
@@
#include <dcp/subtitle_string.h>
#include <iostream>
#include <dcp/subtitle_string.h>
#include <iostream>
-using std::list;
-using std::vector;
-using std::string;
+
using std::cout;
using std::cout;
-using std::ma
x
;
+using std::ma
ke_shared
;
using std::shared_ptr;
using std::shared_ptr;
-using
boost::optional
;
-using std::
dynamic_pointer_cast
;
+using
std::string
;
+using std::
vector
;
using namespace dcpomatic;
using namespace dcpomatic;
+
StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
: Decoder (film)
, StringTextFile (content)
, _next (0)
{
StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
: Decoder (film)
, StringTextFile (content)
, _next (0)
{
- ContentTime first;
- 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()));
+ update_position();
}
}
+
void
StringTextFileDecoder::seek (ContentTime time, bool accurate)
{
void
StringTextFileDecoder::seek (ContentTime time, bool accurate)
{
@@
-64,8
+62,11
@@
StringTextFileDecoder::seek (ContentTime time, bool accurate)
while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
++_next;
}
while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
++_next;
}
+
+ update_position();
}
}
+
bool
StringTextFileDecoder::pass ()
{
bool
StringTextFileDecoder::pass ()
{
@@
-77,9
+78,13
@@
StringTextFileDecoder::pass ()
only_text()->emit_plain (p, _subtitles[_next]);
++_next;
only_text()->emit_plain (p, _subtitles[_next]);
++_next;
+
+ update_position();
+
return false;
}
return false;
}
+
ContentTimePeriod
StringTextFileDecoder::content_time_period (sub::Subtitle s) const
{
ContentTimePeriod
StringTextFileDecoder::content_time_period (sub::Subtitle s) const
{
@@
-90,15
+95,13
@@
StringTextFileDecoder::content_time_period (sub::Subtitle s) const
}
}
-v
ector<FontData>
-StringTextFileDecoder::
fonts () const
+v
oid
+StringTextFileDecoder::
update_position ()
{
{
- vector<FontData> data;
- for (auto i: text) {
- for (auto j: i->content()->fonts()) {
- data.push_back (FontData(j));
- }
+ if (_next < _subtitles.size()) {
+ only_text()->maybe_set_position(
+ ContentTime::from_seconds(_subtitles[_next].from.all_as_seconds())
+ );
}
}
- return data;
}
}