projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calcu...
[dcpomatic.git]
/
src
/
lib
/
content.h
diff --git
a/src/lib/content.h
b/src/lib/content.h
index 659995b3b8e13c5d2e6b5cb435931bd88ed15010..c6cede5fa6cafde4d04f18dc1943a3551c858a2c 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
5
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,14
+24,14
@@
#ifndef DCPOMATIC_CONTENT_H
#define DCPOMATIC_CONTENT_H
#ifndef DCPOMATIC_CONTENT_H
#define DCPOMATIC_CONTENT_H
-#include <set>
+#include "types.h"
+#include "dcpomatic_time.h"
+#include <libxml++/libxml++.h>
+#include <libcxml/cxml.h>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
#include <boost/filesystem.hpp>
#include <boost/signals2.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/enable_shared_from_this.hpp>
-#include <libxml++/libxml++.h>
-#include "types.h"
-#include "dcpomatic_time.h"
namespace cxml {
class Node;
namespace cxml {
class Node;
@@
-59,17
+59,26
@@
public:
Content (boost::shared_ptr<const Film>);
Content (boost::shared_ptr<const Film>, DCPTime);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
Content (boost::shared_ptr<const Film>);
Content (boost::shared_ptr<const Film>, DCPTime);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
- Content (boost::shared_ptr<const Film>,
boost::shared_ptr<const cxml::Node>
);
+ Content (boost::shared_ptr<const Film>,
cxml::ConstNodePtr
);
Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
virtual ~Content () {}
Content (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
virtual ~Content () {}
+
+ /** Examine the content to establish digest, frame rates and any other
+ * useful metadata.
+ * @param job Job to use to report progress, or 0.
+ */
+ virtual void examine (boost::shared_ptr<Job> job);
- virtual void examine (boost::shared_ptr<Job>);
+ /** @return Quick one-line summary of the content, as will be presented in the
+ * film editor.
+ */
virtual std::string summary () const = 0;
virtual std::string summary () const = 0;
+
/** @return Technical details of this content; these are written to logs to
* help with debugging.
*/
virtual std::string technical_summary () const;
/** @return Technical details of this content; these are written to logs to
* help with debugging.
*/
virtual std::string technical_summary () const;
- virtual std::string information () const = 0;
+
virtual void as_xml (xmlpp::Node *) const;
virtual DCPTime full_length () const = 0;
virtual std::string identifier () const;
virtual void as_xml (xmlpp::Node *) const;
virtual DCPTime full_length () const = 0;
virtual std::string identifier () const;
@@
-97,7
+106,10
@@
public:
bool paths_valid () const;
bool paths_valid () const;
- /** @return MD5 digest of the content's file(s) */
+ /** @return Digest of the content's file(s). Note: this is
+ * not a complete MD5-or-whatever hash, but a sort of poor
+ * man' version (see comments in ::examine).
+ */
std::string digest () const {
boost::mutex::scoped_lock lm (_mutex);
return _digest;
std::string digest () const {
boost::mutex::scoped_lock lm (_mutex);
return _digest;
@@
-137,6
+149,10
@@
public:
_change_signals_frequent = f;
}
_change_signals_frequent = f;
}
+ boost::shared_ptr<const Film> film () const {
+ return _film.lock ();
+ }
+
boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
protected:
boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
protected: