projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take Film pointer out of Content.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index fedc43d6417f90c978281ee18b36c931d42ff558..874e1ee318f447914e4a6fdbb464b27dccbe6eed 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-36,9
+36,10
@@
public:
static int const NEEDS_ASSETS;
static int const REFERENCE_VIDEO;
static int const REFERENCE_AUDIO;
static int const NEEDS_ASSETS;
static int const REFERENCE_VIDEO;
static int const REFERENCE_AUDIO;
- static int const REFERENCE_
CAPTION
;
+ static int const REFERENCE_
TEXT
;
static int const NAME;
static int const NAME;
- static int const CAPTIONS;
+ static int const TEXTS;
+ static int const CPL;
};
class ContentPart;
};
class ContentPart;
@@
-49,8
+50,8
@@
class ContentPart;
class DCPContent : public Content
{
public:
class DCPContent : public Content
{
public:
- DCPContent (boost::
shared_ptr<const Film>, boost::
filesystem::path p);
- DCPContent (
boost::shared_ptr<const Film>,
cxml::ConstNodePtr, int version);
+ DCPContent (boost::filesystem::path p);
+ DCPContent (cxml::ConstNodePtr, int version);
boost::shared_ptr<DCPContent> shared_from_this () {
return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
boost::shared_ptr<DCPContent> shared_from_this () {
return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
@@
-60,9
+61,9
@@
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 () const;
+ DCPTime full_length (
boost::shared_ptr<const Film> film
) const;
- void examine (boost::shared_ptr<Job>);
+ void examine (boost::shared_ptr<
const Film> film, boost::shared_ptr<
Job>);
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;
@@
-70,7
+71,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 () const;
+ std::list<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;
@@
-97,7
+98,7
@@
public:
return _reference_video;
}
return _reference_video;
}
- bool can_reference_video (std::string &) const;
+ bool can_reference_video (
boost::shared_ptr<const Film> film,
std::string &) const;
void set_reference_audio (bool r);
void set_reference_audio (bool r);
@@
-106,19
+107,19
@@
public:
return _reference_audio;
}
return _reference_audio;
}
- bool can_reference_audio (std::string &) const;
+ bool can_reference_audio (
boost::shared_ptr<const Film> film,
std::string &) const;
- void set_reference_
caption
(TextType type, bool r);
+ void set_reference_
text
(TextType type, bool r);
- /** @param type Original type of
caption
s in the DCP.
- * @return true if these
caption
s are to be referenced.
+ /** @param type Original type of
text
s in the DCP.
+ * @return true if these
text
s are to be referenced.
*/
*/
- bool reference_
caption
(TextType type) const {
+ bool reference_
text
(TextType type) const {
boost::mutex::scoped_lock lm (_mutex);
boost::mutex::scoped_lock lm (_mutex);
- return _reference_
caption
[type];
+ return _reference_
text
[type];
}
}
- bool can_reference_
caption (
TextType type, std::string &) const;
+ bool can_reference_
text (boost::shared_ptr<const Film> film,
TextType type, std::string &) const;
void set_cpl (std::string id);
void set_cpl (std::string id);
@@
-137,14
+138,22
@@
public:
return _three_d;
}
return _three_d;
}
+ boost::optional<dcp::ContentKind> content_kind () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _content_kind;
+ }
+
+ bool kdm_timing_window_valid () const;
+
private:
friend class reels_test5;
private:
friend class reels_test5;
- void add_properties (std::list<UserProperty>& p) const;
+ void add_properties (
boost::shared_ptr<const Film> film,
std::list<UserProperty>& p) const;
void read_directory (boost::filesystem::path);
void read_directory (boost::filesystem::path);
- std::list<DCPTimePeriod> reels () const;
+ std::list<DCPTimePeriod> reels (
boost::shared_ptr<const Film> film
) const;
bool can_reference (
bool can_reference (
+ boost::shared_ptr<const Film> film,
boost::function <bool (boost::shared_ptr<const Content>)>,
std::string overlapping,
std::string& why_not
boost::function <bool (boost::shared_ptr<const Content>)>,
std::string overlapping,
std::string& why_not
@@
-166,13
+175,14
@@
private:
* rather than by rewrapping.
*/
bool _reference_audio;
* rather than by rewrapping.
*/
bool _reference_audio;
- /** true if the
caption
s in this DCP should be included in the output by reference
- * rather than by rewrapping. The types here are the original
caption
types,
+ /** true if the
text
s in this DCP should be included in the output by reference
+ * rather than by rewrapping. The types here are the original
text
types,
* not what they are being used for.
*/
* not what they are being used for.
*/
- bool _reference_
caption[CAPTION
_COUNT];
+ bool _reference_
text[TEXT
_COUNT];
boost::optional<dcp::Standard> _standard;
boost::optional<dcp::Standard> _standard;
+ boost::optional<dcp::ContentKind> _content_kind;
bool _three_d;
/** ID of the CPL to use; older metadata might not specify this: in that case
* just use the only CPL.
bool _three_d;
/** ID of the CPL to use; older metadata might not specify this: in that case
* just use the only CPL.