projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make ::get tell caller if there's been an underrun.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 17bdd09ebc35aaeaf0b9670d75d89736535d7cfc..ec64c39130c6398670d298f7a76f08e7f710bdb3 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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/>.
*/
*/
@@
-46,7
+47,6
@@
namespace xmlpp {
class DCPContentType;
class Log;
class Content;
class DCPContentType;
class Log;
class Content;
-class Player;
class Playlist;
class AudioContent;
class Screen;
class Playlist;
class AudioContent;
class Screen;
@@
-67,7
+67,7
@@
struct isdcf_name_test;
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
{
public:
- Film (boost::
filesystem::path, bool log = true
);
+ Film (boost::
optional<boost::filesystem::path> dir
);
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
~Film ();
boost::filesystem::path info_file (DCPTimePeriod p) const;
@@
-88,11
+88,15
@@
public:
}
boost::filesystem::path file (boost::filesystem::path f) const;
}
boost::filesystem::path file (boost::filesystem::path f) const;
- boost::filesystem::path dir (boost::filesystem::path d) const;
+ boost::filesystem::path dir (boost::filesystem::path d
, bool create = true
) const;
- std::list<std::string> read_metadata ();
+ void use_template (std::string name);
+ std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
void write_metadata () const;
void write_metadata () const;
- boost::shared_ptr<xmlpp::Document> metadata () const;
+ void write_template (boost::filesystem::path path) const;
+ boost::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
+
+ void copy_from (boost::shared_ptr<const Film> film);
std::string isdcf_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
std::string isdcf_name (bool if_created_now) const;
std::string dcp_name (bool if_created_now = false) const;
@@
-118,9
+122,9
@@
public:
DCPTime length () const;
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
DCPTime length () const;
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
+ std::pair<double, double> speed_up_range (int dcp_frame_rate) const;
- dcp::EncryptedKDM
- make_kdm (
+ dcp::EncryptedKDM make_kdm (
dcp::Certificate recipient,
std::vector<dcp::Certificate> trusted_devices,
boost::filesystem::path cpl_file,
dcp::Certificate recipient,
std::vector<dcp::Certificate> trusted_devices,
boost::filesystem::path cpl_file,
@@
-130,10
+134,10
@@
public:
) const;
std::list<ScreenKDM> make_kdms (
) const;
std::list<ScreenKDM> make_kdms (
- std::list<boost::shared_ptr<Screen> >,
+ std::list<boost::shared_ptr<Screen> >
screens
,
boost::filesystem::path cpl_file,
boost::filesystem::path cpl_file,
-
dcp::LocalT
ime from,
-
dcp::LocalT
ime until,
+
boost::posix_time::pt
ime from,
+
boost::posix_time::pt
ime until,
dcp::Formulation formulation
) const;
dcp::Formulation formulation
) const;
@@
-143,7
+147,11
@@
public:
std::string subtitle_language () const;
std::string subtitle_language () const;
- void make_audio_mapping_default (AudioMapping & mapping) const;
+ void make_audio_mapping_default (
+ AudioMapping & mapping,
+ boost::optional<boost::filesystem::path> filename = boost::optional<boost::filesystem::path> ()
+ ) const;
+
std::vector<std::string> audio_output_names () const;
void repeat_content (ContentList, int);
std::vector<std::string> audio_output_names () const;
void repeat_content (ContentList, int);
@@
-153,6
+161,11
@@
public:
}
std::list<DCPTimePeriod> reels () const;
}
std::list<DCPTimePeriod> reels () const;
+ std::list<int> mapped_audio_channels () const;
+
+ std::string content_summary (DCPTimePeriod period) const;
+
+ std::list<std::string> fix_conflicting_settings ();
/** Identifiers for the parts of our state;
used for signalling changes.
/** Identifiers for the parts of our state;
used for signalling changes.
@@
-163,6
+176,8
@@
public:
USE_ISDCF_NAME,
/** The playlist's content list has changed (i.e. content has been added or removed) */
CONTENT,
USE_ISDCF_NAME,
/** The playlist's content list has changed (i.e. content has been added or removed) */
CONTENT,
+ /** The order of content in the playlist has changed */
+ CONTENT_ORDER,
DCP_CONTENT_TYPE,
CONTAINER,
RESOLUTION,
DCP_CONTENT_TYPE,
CONTAINER,
RESOLUTION,
@@
-175,17
+190,18
@@
public:
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
THREE_D,
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
THREE_D,
- SEQUENCE
_VIDEO
,
+ SEQUENCE,
INTEROP,
AUDIO_PROCESSOR,
REEL_TYPE,
INTEROP,
AUDIO_PROCESSOR,
REEL_TYPE,
- REEL_LENGTH
+ REEL_LENGTH,
+ UPLOAD_AFTER_MAKE_DCP
};
/* GET */
};
/* GET */
- boost::
filesystem::path
directory () const {
+ boost::
optional<boost::filesystem::path>
directory () const {
return _directory;
}
return _directory;
}
@@
-243,8
+259,8
@@
public:
return _three_d;
}
return _three_d;
}
- bool sequence
_video
() const {
- return _sequence
_video
;
+ bool sequence () const {
+ return _sequence;
}
bool interop () const {
}
bool interop () const {
@@
-263,12
+279,20
@@
public:
return _reel_length;
}
return _reel_length;
}
+ bool upload_after_make_dcp () const {
+ return _upload_after_make_dcp;
+ }
+
+ std::string context_id () const {
+ return _context_id;
+ }
+
+
/* SET */
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
/* SET */
void set_directory (boost::filesystem::path);
void set_name (std::string);
void set_use_isdcf_name (bool);
- void examine_content (boost::shared_ptr<Content>);
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
@@
-287,11
+311,12
@@
public:
void set_audio_channels (int);
void set_three_d (bool);
void set_isdcf_date_today ();
void set_audio_channels (int);
void set_three_d (bool);
void set_isdcf_date_today ();
- void set_sequence
_video
(bool);
+ void set_sequence (bool);
void set_interop (bool);
void set_audio_processor (AudioProcessor const * processor);
void set_reel_type (ReelType);
void set_reel_length (int64_t);
void set_interop (bool);
void set_audio_processor (AudioProcessor const * processor);
void set_reel_type (ReelType);
void set_reel_length (int64_t);
+ void set_upload_after_make_dcp (bool);
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
@@
-309,10
+334,13
@@
private:
void signal_changed (Property);
std::string video_identifier () const;
void playlist_changed ();
void signal_changed (Property);
std::string video_identifier () const;
void playlist_changed ();
+ void playlist_order_changed ();
void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
void audio_analysis_finished ();
void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
void audio_analysis_finished ();
+ static std::string const metadata_file;
+
/** Log to write to */
boost::shared_ptr<Log> _log;
boost::shared_ptr<Playlist> _playlist;
/** Log to write to */
boost::shared_ptr<Log> _log;
boost::shared_ptr<Playlist> _playlist;
@@
-320,7
+348,7
@@
private:
/** Complete path to directory containing the film metadata;
* must not be relative.
*/
/** Complete path to directory containing the film metadata;
* must not be relative.
*/
- boost::
filesystem::path
_directory;
+ boost::
optional<boost::filesystem::path>
_directory;
/** Name for DCP-o-matic */
std::string _name;
/** Name for DCP-o-matic */
std::string _name;
@@
-335,6
+363,10
@@
private:
bool _signed;
bool _encrypted;
dcp::Key _key;
bool _signed;
bool _encrypted;
dcp::Key _key;
+ /** context ID used when encrypting picture assets; we keep it so that we can
+ * re-start picture MXF encodes.
+ */
+ std::string _context_id;
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */
/** bandwidth for J2K files in bits per second */
int _j2k_bandwidth;
/** ISDCF naming stuff */
@@
-349,19
+381,23
@@
private:
This will be regardless of what content is on the playlist.
*/
bool _three_d;
This will be regardless of what content is on the playlist.
*/
bool _three_d;
- bool _sequence
_video
;
+ bool _sequence;
bool _interop;
AudioProcessor const * _audio_processor;
ReelType _reel_type;
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
int64_t _reel_length;
bool _interop;
AudioProcessor const * _audio_processor;
ReelType _reel_type;
/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
int64_t _reel_length;
+ bool _upload_after_make_dcp;
int _state_version;
/** true if our state has changed since we last saved it */
mutable bool _dirty;
int _state_version;
/** true if our state has changed since we last saved it */
mutable bool _dirty;
+ /** film being used as a template, or 0 */
+ boost::shared_ptr<Film> _template_film;
boost::signals2::scoped_connection _playlist_changed_connection;
boost::signals2::scoped_connection _playlist_changed_connection;
+ boost::signals2::scoped_connection _playlist_order_changed_connection;
boost::signals2::scoped_connection _playlist_content_changed_connection;
std::list<boost::signals2::connection> _job_connections;
std::list<boost::signals2::connection> _audio_analysis_connections;
boost::signals2::scoped_connection _playlist_content_changed_connection;
std::list<boost::signals2::connection> _job_connections;
std::list<boost::signals2::connection> _audio_analysis_connections;