projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidy up handling of content-modified checks when using the dcpomatic_cli.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index b77ce7a7651099dfd4334381002613b824207af4..1c5022428a332563ee586ca1441cfc64756ae69c 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
8
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
9
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-45,12
+45,15
@@
namespace xmlpp {
class Document;
}
class Document;
}
+namespace dcpomatic {
+ class Screen;
+}
+
class DCPContentType;
class Log;
class Content;
class Playlist;
class AudioContent;
class DCPContentType;
class Log;
class Content;
class Playlist;
class AudioContent;
-class Screen;
class AudioProcessor;
class AudioMapping;
class Ratio;
class AudioProcessor;
class AudioMapping;
class Ratio;
@@
-71,15
+74,15
@@
public:
explicit Film (boost::optional<boost::filesystem::path> dir);
~Film ();
explicit Film (boost::optional<boost::filesystem::path> dir);
~Film ();
- boost::filesystem::path info_file (DCPTimePeriod p) const;
+ boost::filesystem::path info_file (
dcpomatic::
DCPTimePeriod p) const;
boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
boost::filesystem::path internal_video_asset_dir () const;
boost::filesystem::path j2c_path (int, Frame, Eyes, bool) const;
boost::filesystem::path internal_video_asset_dir () const;
- boost::filesystem::path internal_video_asset_filename (DCPTimePeriod p) const;
+ boost::filesystem::path internal_video_asset_filename (
dcpomatic::
DCPTimePeriod p) const;
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
void send_dcp_to_tms ();
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
void send_dcp_to_tms ();
- void make_dcp ();
+ void make_dcp (
bool gui = false
);
/** @return Logger.
* It is safe to call this from any thread.
/** @return Logger.
* It is safe to call this from any thread.
@@
-123,9
+126,9
@@
public:
/* Proxies for some Playlist methods */
ContentList content () const;
/* Proxies for some Playlist methods */
ContentList content () const;
- DCPTime length () const;
+
dcpomatic::
DCPTime length () const;
int best_video_frame_rate () const;
int best_video_frame_rate () const;
- FrameRateChange active_frame_rate_change (DCPTime) const;
+ FrameRateChange active_frame_rate_change (
dcpomatic::
DCPTime) const;
std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
dcp::EncryptedKDM make_kdm (
std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
dcp::EncryptedKDM make_kdm (
@@
-139,8
+142,8
@@
public:
boost::optional<int> disable_forensic_marking_audio
) const;
boost::optional<int> disable_forensic_marking_audio
) const;
- std::list<
ScreenKDM
> make_kdms (
- std::list<boost::shared_ptr<Screen> > screens,
+ std::list<
boost::shared_ptr<ScreenKDM>
> make_kdms (
+ std::list<boost::shared_ptr<
dcpomatic::
Screen> > screens,
boost::filesystem::path cpl_file,
boost::posix_time::ptime from,
boost::posix_time::ptime until,
boost::filesystem::path cpl_file,
boost::posix_time::ptime from,
boost::posix_time::ptime until,
@@
-163,10
+166,10
@@
public:
return _playlist;
}
return _playlist;
}
- std::list<DCPTimePeriod> reels () const;
+ std::list<
dcpomatic::
DCPTimePeriod> reels () const;
std::list<int> mapped_audio_channels () const;
std::list<int> mapped_audio_channels () const;
- std::string content_summary (DCPTimePeriod period) const;
+ std::string content_summary (
dcpomatic::
DCPTimePeriod period) const;
bool references_dcp_video () const;
bool references_dcp_audio () const;
bool references_dcp_video () const;
bool references_dcp_audio () const;
@@
-200,7
+203,9
@@
public:
REEL_TYPE,
REEL_LENGTH,
UPLOAD_AFTER_MAKE_DCP,
REEL_TYPE,
REEL_LENGTH,
UPLOAD_AFTER_MAKE_DCP,
- REENCODE_J2K
+ REENCODE_J2K,
+ MARKERS,
+ RATINGS
};
};
@@
-296,6
+301,14
@@
public:
return _reencode_j2k;
}
return _reencode_j2k;
}
+ boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
+ std::map<dcp::Marker, dcpomatic::DCPTime> markers () const {
+ return _markers;
+ }
+
+ std::vector<dcp::Rating> ratings () const {
+ return _ratings;
+ }
/* SET */
/* SET */
@@
-327,6
+340,9
@@
public:
void set_reel_length (int64_t);
void set_upload_after_make_dcp (bool);
void set_reencode_j2k (bool);
void set_reel_length (int64_t);
void set_upload_after_make_dcp (bool);
void set_reencode_j2k (bool);
+ void set_marker (dcp::Marker type, dcpomatic::DCPTime time);
+ void unset_marker (dcp::Marker type);
+ void set_ratings (std::vector<dcp::Rating> r);
/** Emitted when some property has of the Film is about to change or has changed */
mutable boost::signals2::signal<void (ChangeType, Property)> Change;
/** Emitted when some property has of the Film is about to change or has changed */
mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@
-406,6
+422,8
@@
private:
bool _reencode_j2k;
/** true if the user has ever explicitly set the video frame rate of this film */
bool _user_explicit_video_frame_rate;
bool _reencode_j2k;
/** true if the user has ever explicitly set the video frame rate of this film */
bool _user_explicit_video_frame_rate;
+ std::map<dcp::Marker, dcpomatic::DCPTime> _markers;
+ std::vector<dcp::Rating> _ratings;
int _state_version;
int _state_version;
@@
-414,7
+432,6
@@
private:
/** film being used as a template, or 0 */
boost::shared_ptr<Film> _template_film;
/** film being used as a template, or 0 */
boost::shared_ptr<Film> _template_film;
-
boost::signals2::scoped_connection _playlist_change_connection;
boost::signals2::scoped_connection _playlist_order_changed_connection;
boost::signals2::scoped_connection _playlist_content_change_connection;
boost::signals2::scoped_connection _playlist_change_connection;
boost::signals2::scoped_connection _playlist_order_changed_connection;
boost::signals2::scoped_connection _playlist_content_change_connection;