projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove use of boost::noncopyable.
[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 8c9880b0c7118881942b3cebb2ab76991e25bf06..f24147851847e1ee120354984f2dbd40f20630a7 100644
(file)
--- a/
src/lib/string_text_file_decoder.cc
+++ b/
src/lib/string_text_file_decoder.cc
@@
-23,7
+23,6
@@
#include "text_content.h"
#include "text_decoder.h"
#include <dcp/subtitle_string.h>
#include "text_content.h"
#include "text_decoder.h"
#include <dcp/subtitle_string.h>
-#include <boost/foreach.hpp>
#include <iostream>
using std::list;
#include <iostream>
using std::list;
@@
-31,9
+30,10
@@
using std::vector;
using std::string;
using std::cout;
using std::max;
using std::string;
using std::cout;
using std::max;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using namespace dcpomatic;
StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
: Decoder (film)
StringTextFileDecoder::StringTextFileDecoder (shared_ptr<const Film> film, shared_ptr<const StringTextFileContent> content)
: Decoder (film)
@@
-88,3
+88,17
@@
StringTextFileDecoder::content_time_period (sub::Subtitle s) const
ContentTime::from_seconds (s.to.all_as_seconds())
);
}
ContentTime::from_seconds (s.to.all_as_seconds())
);
}
+
+
+vector<FontData>
+StringTextFileDecoder::fonts () const
+{
+ vector<FontData> data;
+ for (auto i: text) {
+ for (auto j: i->content()->fonts()) {
+ data.push_back (FontData(j));
+ }
+ }
+ return data;
+}
+