projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Time types in dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index 763b3e903358ff1809e289486bc1a6b504e8f7d5..65bed29bc91bd55b7ab16ce4ad3937ee151527bc 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-61,8
+61,8
@@
public:
return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
}
return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
}
- DCPTime full_length (boost::shared_ptr<const Film> film) const;
- DCPTime approximate_length () const;
+
dcpomatic::
DCPTime full_length (boost::shared_ptr<const Film> film) const;
+
dcpomatic::
DCPTime approximate_length () const;
void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
std::string summary () const;
void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
std::string summary () const;
@@
-72,7
+72,7
@@
public:
void take_settings_from (boost::shared_ptr<const Content> c);
void set_default_colour_conversion ();
void take_settings_from (boost::shared_ptr<const Content> c);
void set_default_colour_conversion ();
- std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
+ std::list<
dcpomatic::
DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
std::vector<boost::filesystem::path> directories () const;
std::vector<boost::filesystem::path> directories () const;
@@
-153,7
+153,7
@@
private:
void read_directory (boost::filesystem::path);
void read_sub_directory (boost::filesystem::path);
void read_directory (boost::filesystem::path);
void read_sub_directory (boost::filesystem::path);
- std::list<DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
+ std::list<
dcpomatic::
DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
bool can_reference (
boost::shared_ptr<const Film> film,
boost::function <bool (boost::shared_ptr<const Content>)>,
bool can_reference (
boost::shared_ptr<const Film> film,
boost::function <bool (boost::shared_ptr<const Content>)>,