projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1.0' of git.carlh.net:git/dcpomatic into 2.0
[dcpomatic.git]
/
src
/
lib
/
dcp_content.h
diff --git
a/src/lib/dcp_content.h
b/src/lib/dcp_content.h
index da78e6d72a5cc0bd22f7f111c875013d41609ee3..82f5a8089be69ff40bf753169213358d92dfc64b 100644
(file)
--- a/
src/lib/dcp_content.h
+++ b/
src/lib/dcp_content.h
@@
-24,12
+24,12
@@
* @brief DCPContent class.
*/
* @brief DCPContent class.
*/
-#include <libcxml/cxml.h>
-#include <dcp/encrypted_kdm.h>
-#include <dcp/decrypted_kdm.h>
#include "video_content.h"
#include "single_stream_audio_content.h"
#include "subtitle_content.h"
#include "video_content.h"
#include "single_stream_audio_content.h"
#include "subtitle_content.h"
+#include <libcxml/cxml.h>
+#include <dcp/encrypted_kdm.h>
+#include <dcp/decrypted_kdm.h>
class DCPContentProperty
{
class DCPContentProperty
{
@@
-52,7
+52,7
@@
public:
DCPTime full_length () const;
DCPTime full_length () const;
- void examine (boost::shared_ptr<Job>);
+ void examine (boost::shared_ptr<Job>
, bool calculate_digest
);
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *) const;
std::string summary () const;
std::string technical_summary () const;
void as_xml (xmlpp::Node *) const;