projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disallow referencing of Interop DCPs in SMPTE films, and vice versa (#804).
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index 5a0559df2212dd28d1a65a062c637bb62673990f..7ea9c3500f95b1284b05c9c9210cd742ad5004ff 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2016
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-24,9
+24,7
@@
* @brief DCPContent class.
*/
* @brief DCPContent class.
*/
-#include "video_content.h"
-#include "single_stream_audio_content.h"
-#include "subtitle_content.h"
+#include "content.h"
#include <libcxml/cxml.h>
#include <dcp/encrypted_kdm.h>
#include <libcxml/cxml.h>
#include <dcp/encrypted_kdm.h>
@@
-34,12
+32,17
@@
class DCPContentProperty
{
public:
static int const CAN_BE_PLAYED;
{
public:
static int const CAN_BE_PLAYED;
+ static int const REFERENCE_VIDEO;
+ static int const REFERENCE_AUDIO;
+ static int const REFERENCE_SUBTITLE;
};
};
+class ContentPart;
+
/** @class DCPContent
* @brief An existing DCP used as input.
*/
/** @class DCPContent
* @brief An existing DCP used as input.
*/
-class DCPContent : public
VideoContent, public SingleStreamAudioContent, public Subtitle
Content
+class DCPContent : public Content
{
public:
DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
{
public:
DCPContent (boost::shared_ptr<const Film>, boost::filesystem::path p);
@@
-49,6
+52,10
@@
public:
return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
}
return boost::dynamic_pointer_cast<DCPContent> (Content::shared_from_this ());
}
+ boost::shared_ptr<const DCPContent> shared_from_this () const {
+ return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
+ }
+
DCPTime full_length () const;
void examine (boost::shared_ptr<Job>);
DCPTime full_length () const;
void examine (boost::shared_ptr<Job>);
@@
-58,17
+65,7
@@
public:
std::string identifier () const;
void set_default_colour_conversion ();
std::string identifier () const;
void set_default_colour_conversion ();
-
- /* SubtitleContent */
-
- bool has_text_subtitles () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _has_subtitles;
- }
-
- bool has_image_subtitles () const {
- return false;
- }
+ std::list<DCPTime> reel_split_points () const;
boost::filesystem::path directory () const;
boost::filesystem::path directory () const;
@@
-85,29
+82,45
@@
public:
bool can_be_played () const;
bool can_be_played () const;
+ void set_reference_video (bool r);
+
bool reference_video () const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_video;
}
bool reference_video () const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_video;
}
+ bool can_reference_video (std::list<std::string> &) const;
+
+ void set_reference_audio (bool r);
+
bool reference_audio () const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_audio;
}
bool reference_audio () const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_audio;
}
+ bool can_reference_audio (std::list<std::string> &) const;
+
+ void set_reference_subtitle (bool r);
+
bool reference_subtitle () const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_subtitle;
}
bool reference_subtitle () const {
boost::mutex::scoped_lock lm (_mutex);
return _reference_subtitle;
}
-protected:
- void add_properties (std::list<std::pair<std::string, std::string> >& p) const;
+ bool can_reference_subtitle (std::list<std::string> &) const;
private:
private:
+ void add_properties (std::list<UserProperty>& p) const;
+
void read_directory (boost::filesystem::path);
void read_directory (boost::filesystem::path);
+ std::list<DCPTimePeriod> reels () const;
+ bool can_reference (
+ boost::function <boost::shared_ptr<ContentPart> (boost::shared_ptr<const Content>)>,
+ std::string overlapping,
+ std::list<std::string>& why_not
+ ) const;
std::string _name;
std::string _name;
- bool _has_subtitles;
/** true if our DCP is encrypted */
bool _encrypted;
boost::optional<dcp::EncryptedKDM> _kdm;
/** true if our DCP is encrypted */
bool _encrypted;
boost::optional<dcp::EncryptedKDM> _kdm;
@@
-125,6
+138,8
@@
private:
* rather than by rewrapping.
*/
bool _reference_subtitle;
* rather than by rewrapping.
*/
bool _reference_subtitle;
+
+ boost::optional<dcp::Standard> _standard;
};
#endif
};
#endif