projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Re-work idle handling from previous commit.
[dcpomatic.git]
/
src
/
lib
/
image_content.h
diff --git
a/src/lib/image_content.h
b/src/lib/image_content.h
index e2a2ec36623b40faa6a7b69baca72e698d0a01d5..970a68d661271be3b567d714ec880cc55111527a 100644
(file)
--- a/
src/lib/image_content.h
+++ b/
src/lib/image_content.h
@@
-41,8
+41,8
@@
public:
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
- 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;
std::string identifier () const;
std::string identifier () const;
@@
-51,7
+51,7
@@
public:
bool still () const;
private:
bool still () const;
private:
- void add_properties (std::list<UserProperty>& p) const;
+ void add_properties (
boost::shared_ptr<const Film> film,
std::list<UserProperty>& p) const;
boost::optional<boost::filesystem::path> _path_to_scan;
};
boost::optional<boost::filesystem::path> _path_to_scan;
};