projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix assertion failure when content has more than one audio stream.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index 1212b8b0fbf3ff79f3681d10b8c0fd6044b5b516..43476e729c7f8ca3495bb26dcde21988b96dc4e5 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-36,8
+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_
SUBTITLE
;
+ static int const REFERENCE_
TEXT
;
static int const NAME;
static int const NAME;
+ static int const TEXTS;
+ static int const CPL;
};
class ContentPart;
};
class ContentPart;
@@
-66,7
+68,7
@@
public:
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
std::string identifier () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *, bool with_paths) const;
std::string identifier () const;
- void
use_template
(boost::shared_ptr<const Content> c);
+ void
take_settings_from
(boost::shared_ptr<const Content> c);
void set_default_colour_conversion ();
std::list<DCPTime> reel_split_points () const;
void set_default_colour_conversion ();
std::list<DCPTime> reel_split_points () const;
@@
-96,7
+98,7
@@
public:
return _reference_video;
}
return _reference_video;
}
- bool can_reference_video (std::
list<std::string>
&) const;
+ bool can_reference_video (std::
string
&) const;
void set_reference_audio (bool r);
void set_reference_audio (bool r);
@@
-105,16
+107,19
@@
public:
return _reference_audio;
}
return _reference_audio;
}
- bool can_reference_audio (std::
list<std::string>
&) const;
+ bool can_reference_audio (std::
string
&) const;
- void set_reference_
subtitle (
bool r);
+ void set_reference_
text (TextType type,
bool r);
- bool reference_subtitle () const {
+ /** @param type Original type of texts in the DCP.
+ * @return true if these texts are to be referenced.
+ */
+ bool reference_text (TextType type) const {
boost::mutex::scoped_lock lm (_mutex);
boost::mutex::scoped_lock lm (_mutex);
- return _reference_
subtitle
;
+ return _reference_
text[type]
;
}
}
- bool can_reference_
subtitle (std::list<std::string>
&) const;
+ bool can_reference_
text (TextType type, std::string
&) const;
void set_cpl (std::string id);
void set_cpl (std::string id);
@@
-123,6
+128,16
@@
public:
return _cpl;
}
return _cpl;
}
+ std::string name () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _name;
+ }
+
+ bool three_d () const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _three_d;
+ }
+
private:
friend class reels_test5;
private:
friend class reels_test5;
@@
-131,16
+146,11
@@
private:
void read_directory (boost::filesystem::path);
std::list<DCPTimePeriod> reels () const;
bool can_reference (
void read_directory (boost::filesystem::path);
std::list<DCPTimePeriod> reels () const;
bool can_reference (
- boost::function <boo
st::shared_ptr<ContentPart>
(boost::shared_ptr<const Content>)>,
+ boost::function <boo
l
(boost::shared_ptr<const Content>)>,
std::string overlapping,
std::string overlapping,
- std::
list<std::string>
& why_not
+ std::
string
& why_not
) const;
) const;
- std::string name () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _name;
- }
-
std::string _name;
/** true if our DCP is encrypted */
bool _encrypted;
std::string _name;
/** true if our DCP is encrypted */
bool _encrypted;
@@
-157,10
+167,11
@@
private:
* rather than by rewrapping.
*/
bool _reference_audio;
* rather than by rewrapping.
*/
bool _reference_audio;
- /** true if the subtitle in this DCP should be included in the output by reference
- * rather than by rewrapping.
+ /** true if the texts 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.
*/
*/
- bool _reference_
subtitle
;
+ bool _reference_
text[TEXT_COUNT]
;
boost::optional<dcp::Standard> _standard;
bool _three_d;
boost::optional<dcp::Standard> _standard;
bool _three_d;
@@
-168,6
+179,8
@@
private:
* just use the only CPL.
*/
boost::optional<std::string> _cpl;
* just use the only CPL.
*/
boost::optional<std::string> _cpl;
+ /** List of the lengths of the reels in this DCP */
+ std::list<int64_t> _reel_lengths;
};
#endif
};
#endif