projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index 81432b6d310adc4d62a168e086d6753ce2d4b031..255cfa19a1e864ae0364d0d8a6bd4db208487f00 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014-2016 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-24,7
+25,7
@@
* @brief DCPContent class.
*/
* @brief DCPContent class.
*/
-#include "
single_stream_audio_
content.h"
+#include "content.h"
#include <libcxml/cxml.h>
#include <dcp/encrypted_kdm.h>
#include <libcxml/cxml.h>
#include <dcp/encrypted_kdm.h>
@@
-37,10
+38,12
@@
public:
static int const REFERENCE_SUBTITLE;
};
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
SingleStreamAudio
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);
@@
-65,19
+68,6
@@
public:
void set_default_colour_conversion ();
std::list<DCPTime> reel_split_points () const;
void set_default_colour_conversion ();
std::list<DCPTime> reel_split_points () const;
- /* SubtitleContent */
-
- bool has_text_subtitles () const {
- boost::mutex::scoped_lock lm (_mutex);
- return _has_subtitles;
- }
-
- bool has_image_subtitles () const {
- return false;
- }
-
- double subtitle_video_frame_rate () const;
-
boost::filesystem::path directory () const;
bool encrypted () const {
boost::filesystem::path directory () const;
bool encrypted () const {
@@
-120,16
+110,18
@@
public:
bool can_reference_subtitle (std::list<std::string> &) const;
bool can_reference_subtitle (std::list<std::string> &) const;
-pr
otected
:
+pr
ivate
:
void add_properties (std::list<UserProperty>& p) const;
void add_properties (std::list<UserProperty>& p) const;
-private:
void read_directory (boost::filesystem::path);
std::list<DCPTimePeriod> reels () const;
void read_directory (boost::filesystem::path);
std::list<DCPTimePeriod> reels () const;
- template <class T> bool can_reference (std::string overlapping, std::list<std::string>& why_not) 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;
@@
-147,6
+139,8
@@
private:
* rather than by rewrapping.
*/
bool _reference_subtitle;
* rather than by rewrapping.
*/
bool _reference_subtitle;
+
+ boost::optional<dcp::Standard> _standard;
};
#endif
};
#endif