projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up careful_string_filter and add some extra transliterations.
[dcpomatic.git]
/
src
/
lib
/
string_text_file_content.cc
diff --git
a/src/lib/string_text_file_content.cc
b/src/lib/string_text_file_content.cc
index 69d2a67560e35a4f774a39f689ec01e96c8458a1..2ce343f2edb4d700eabff7c8c8916aa52bf1a4af 100644
(file)
--- a/
src/lib/string_text_file_content.cc
+++ b/
src/lib/string_text_file_content.cc
@@
-34,10
+34,10
@@
using std::cout;
using std::cout;
+using std::list;
using std::make_shared;
using std::shared_ptr;
using std::string;
using std::make_shared;
using std::shared_ptr;
using std::string;
-using boost::optional;
using dcp::raw_convert;
using namespace dcpomatic;
using dcp::raw_convert;
using namespace dcpomatic;
@@
-49,11
+49,11
@@
StringTextFileContent::StringTextFileContent (boost::filesystem::path path)
}
}
-StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version)
+StringTextFileContent::StringTextFileContent (cxml::ConstNodePtr node, int version
, list<string>& notes
)
: Content (node)
, _length (node->number_child<ContentTime::Type>("Length"))
{
: Content (node)
, _length (node->number_child<ContentTime::Type>("Length"))
{
- text = TextContent::from_xml (this, node, version);
+ text = TextContent::from_xml (this, node, version
, notes
);
}
}