projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check content for changes on loading a project.
[dcpomatic.git]
/
src
/
lib
/
content.h
diff --git
a/src/lib/content.h
b/src/lib/content.h
index e126c994b24a3adb6aab129b0b8eafa264b61d2c..2eaa738d2c72e3e88a9388cd7bfa28f2eb88d5b6 100644
(file)
--- a/
src/lib/content.h
+++ b/
src/lib/content.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-201
6
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
8
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-28,6
+28,7
@@
#include "types.h"
#include "signaller.h"
#include "dcpomatic_time.h"
#include "types.h"
#include "signaller.h"
#include "dcpomatic_time.h"
+#include "change_signaller.h"
#include "user_property.h"
#include <libcxml/cxml.h>
#include <boost/filesystem.hpp>
#include "user_property.h"
#include <libcxml/cxml.h>
#include <boost/filesystem.hpp>
@@
-63,7
+64,7
@@
public:
class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
{
public:
class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
{
public:
- Content (boost::shared_ptr<const Film>);
+
explicit
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>, cxml::ConstNodePtr);
Content (boost::shared_ptr<const Film>, DCPTime);
Content (boost::shared_ptr<const Film>, boost::filesystem::path);
Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
@@
-76,6
+77,8
@@
public:
*/
virtual void examine (boost::shared_ptr<Job> job);
*/
virtual void examine (boost::shared_ptr<Job> job);
+ virtual void take_settings_from (boost::shared_ptr<const Content> c);
+
/** @return Quick one-line summary of the content, as will be presented in the
* film editor.
*/
/** @return Quick one-line summary of the content, as will be presented in the
* film editor.
*/
@@
-96,7
+99,7
@@
public:
boost::shared_ptr<Content> clone () const;
boost::shared_ptr<Content> clone () const;
- void set_path
(boost::filesystem::path
);
+ void set_path
s (std::vector<boost::filesystem::path> paths
);
std::string path_summary () const;
std::string path_summary () const;
@@
-115,11
+118,16
@@
public:
return _paths[i];
}
return _paths[i];
}
+ std::time_t last_write_time (size_t i) const {
+ boost::mutex::scoped_lock lm (_mutex);
+ return _last_write_times[i];
+ }
+
bool paths_valid () const;
/** @return Digest of the content's file(s). Note: this is
* not a complete MD5-or-whatever hash, but a sort of poor
bool paths_valid () const;
/** @return Digest of the content's file(s). Note: this is
* not a complete MD5-or-whatever hash, but a sort of poor
- * man's version (see comments in
::examine
).
+ * man's version (see comments in
examine()
).
*/
std::string digest () const {
boost::mutex::scoped_lock lm (_mutex);
*/
std::string digest () const {
boost::mutex::scoped_lock lm (_mutex);
@@
-163,6
+171,7
@@
public:
}
void set_video_frame_rate (double r);
}
void set_video_frame_rate (double r);
+ void unset_video_frame_rate ();
double active_video_frame_rate () const;
double active_video_frame_rate () const;
@@
-174,13
+183,17
@@
public:
std::list<UserProperty> user_properties () const;
std::list<UserProperty> user_properties () const;
- boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> Changed;
+ std::string calculate_digest () const;
+
+ /* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */
+ boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> Change;
boost::shared_ptr<VideoContent> video;
boost::shared_ptr<AudioContent> audio;
boost::shared_ptr<VideoContent> video;
boost::shared_ptr<AudioContent> audio;
-
boost::shared_ptr<SubtitleContent> subtitle
;
+
std::list<boost::shared_ptr<TextContent> > text
;
- void signal_changed (int);
+ boost::shared_ptr<TextContent> only_text () const;
+ boost::shared_ptr<TextContent> text_of_original_type (TextType type) const;
protected:
protected:
@@
-193,14
+206,20
@@
protected:
*/
mutable boost::mutex _mutex;
*/
mutable boost::mutex _mutex;
- /** Paths of our data files */
- std::vector<boost::filesystem::path> _paths;
+ void add_path (boost::filesystem::path p);
private:
friend struct ffmpeg_pts_offset_test;
friend struct best_dcp_frame_rate_test_single;
friend struct best_dcp_frame_rate_test_double;
friend struct audio_sampling_rate_test;
private:
friend struct ffmpeg_pts_offset_test;
friend struct best_dcp_frame_rate_test_single;
friend struct best_dcp_frame_rate_test_double;
friend struct audio_sampling_rate_test;
+ template<class> friend class ChangeSignaller;
+
+ void signal_change (ChangeType, int);
+
+ /** Paths of our data files */
+ std::vector<boost::filesystem::path> _paths;
+ std::vector<std::time_t> _last_write_times;
std::string _digest;
DCPTime _position;
std::string _digest;
DCPTime _position;