projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Catch CPLNotFoundError more nicely.
[dcpomatic.git]
/
src
/
lib
/
string_text_file.h
diff --git
a/src/lib/string_text_file.h
b/src/lib/string_text_file.h
index 0091973a46db925d7ab8751c92442f7ca698cc1f..261c2ca6e95047b5b596e80f5e4b81b6662ad2b9 100644
(file)
--- a/
src/lib/string_text_file.h
+++ b/
src/lib/string_text_file.h
@@
-23,7
+23,6
@@
#include "dcpomatic_time.h"
#include <sub/subtitle.h>
#include "dcpomatic_time.h"
#include <sub/subtitle.h>
-#include <boost/shared_ptr.hpp>
#include <vector>
class StringTextFileContent;
#include <vector>
class StringTextFileContent;
@@
-41,10
+40,13
@@
class plain_text_parse_test;
class StringTextFile
{
public:
class StringTextFile
{
public:
- explicit StringTextFile (
boost
::shared_ptr<const StringTextFileContent>);
+ explicit StringTextFile (
std
::shared_ptr<const StringTextFileContent>);
- boost::optional<ContentTime> first () const;
- ContentTime length () const;
+ boost::optional<dcpomatic::ContentTime> first () const;
+ dcpomatic::ContentTime length () const;
+ std::vector<sub::Subtitle> const& subtitles() const {
+ return _subtitles;
+ }
protected:
std::vector<sub::Subtitle> _subtitles;
protected:
std::vector<sub::Subtitle> _subtitles;