projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename TYPE_DEBUG_PLAYER to TYPE_DEBUG_VIDEO_VIEW.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index 874e1ee318f447914e4a6fdbb464b27dccbe6eed..6d707670f27eb6bc267d98cefe7bbcd487cdc31f 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-61,7
+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;
+ 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;
@@
-71,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;
@@
-143,15
+144,36
@@
public:
return _content_kind;
}
return _content_kind;
}
+ dcp::Standard standard () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ DCPOMATIC_ASSERT (_standard);
+ return _standard.get ();
+ }
+
+ std::map<dcp::Marker, dcpomatic::ContentTime> markers () const {
+ return _markers;
+ }
+
bool kdm_timing_window_valid () const;
bool kdm_timing_window_valid () const;
+ Resolution resolution () const;
+
+ std::vector<dcp::Rating> ratings () const {
+ return _ratings;
+ }
+
+ std::string content_version () const {
+ return _content_version;
+ }
+
private:
friend class reels_test5;
void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
void read_directory (boost::filesystem::path);
private:
friend class reels_test5;
void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
void read_directory (boost::filesystem::path);
- std::list<DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
+ void read_sub_directory (boost::filesystem::path);
+ 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>)>,
@@
-190,6
+212,9
@@
private:
boost::optional<std::string> _cpl;
/** List of the lengths of the reels in this DCP */
std::list<int64_t> _reel_lengths;
boost::optional<std::string> _cpl;
/** List of the lengths of the reels in this DCP */
std::list<int64_t> _reel_lengths;
+ std::map<dcp::Marker, dcpomatic::ContentTime> _markers;
+ std::vector<dcp::Rating> _ratings;
+ std::string _content_version;
};
#endif
};
#endif