/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 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.
- 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
- 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/>.
*/
#include "isdcf_metadata.h"
#include "frame_rate_change.h"
#include "signaller.h"
-#include "ratio.h"
#include <dcp/key.h>
#include <dcp/encrypted_kdm.h>
#include <boost/signals2.hpp>
#include <vector>
#include <inttypes.h>
+namespace xmlpp {
+ class Document;
+}
+
class DCPContentType;
class Log;
class Content;
class Screen;
class AudioProcessor;
class AudioMapping;
+class Ratio;
+class Job;
+class ScreenKDM;
struct isdcf_name_test;
/** @class Film
Film (boost::filesystem::path, bool log = true);
~Film ();
- boost::filesystem::path info_file () const;
- boost::filesystem::path j2c_path (int, Eyes, bool) const;
+ boost::filesystem::path info_file (DCPTimePeriod p) 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 () const;
+ boost::filesystem::path internal_video_asset_filename (DCPTimePeriod p) const;
boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
std::vector<CPLSummary> cpls () const;
- boost::shared_ptr<Player> make_player () const;
- boost::shared_ptr<Playlist> playlist () const;
-
int audio_frame_rate () const;
uint64_t required_disk_space () const;
bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
-
+
/* Proxies for some Playlist methods */
ContentList content () const;
int best_video_frame_rate () const;
FrameRateChange active_frame_rate_change (DCPTime) const;
- dcp::EncryptedKDM
- make_kdm (
- dcp::Certificate target,
+ dcp::EncryptedKDM make_kdm (
+ dcp::Certificate recipient,
+ std::vector<dcp::Certificate> trusted_devices,
boost::filesystem::path cpl_file,
dcp::LocalTime from,
dcp::LocalTime until,
dcp::Formulation formulation
) const;
-
- std::list<dcp::EncryptedKDM> make_kdms (
+
+ std::list<ScreenKDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
boost::filesystem::path cpl_file,
- dcp::LocalTime from,
- dcp::LocalTime until,
+ boost::posix_time::ptime from,
+ boost::posix_time::ptime until,
dcp::Formulation formulation
) 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);
+
+ boost::shared_ptr<const Playlist> playlist () const {
+ return _playlist;
+ }
+
+ std::list<DCPTimePeriod> reels () const;
+
+ std::list<int> mapped_audio_channels () const;
+
/** Identifiers for the parts of our state;
used for signalling changes.
*/
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,
AUDIO_CHANNELS,
/** The setting of _three_d has changed */
THREE_D,
- SEQUENCE_VIDEO,
+ SEQUENCE,
INTEROP,
- /** The setting of _burn_subtitles has changed */
- BURN_SUBTITLES,
AUDIO_PROCESSOR,
+ REEL_TYPE,
+ REEL_LENGTH,
+ UPLOAD_AFTER_MAKE_DCP
};
bool is_signed () const {
return _signed;
}
-
+
bool encrypted () const {
return _encrypted;
}
return _three_d;
}
- bool sequence_video () const {
- return _sequence_video;
+ bool sequence () const {
+ return _sequence;
}
bool interop () const {
return _interop;
}
- bool burn_subtitles () const {
- return _burn_subtitles;
- }
-
AudioProcessor const * audio_processor () const {
return _audio_processor;
}
-
+
+ ReelType reel_type () const {
+ return _reel_type;
+ }
+
+ int64_t reel_length () const {
+ return _reel_length;
+ }
+
+ bool upload_after_make_dcp () const {
+ return _upload_after_make_dcp;
+ }
/* SET */
void examine_and_add_content (boost::shared_ptr<Content>);
void add_content (boost::shared_ptr<Content>);
void remove_content (boost::shared_ptr<Content>);
+ void remove_content (ContentList);
void move_content_earlier (boost::shared_ptr<Content>);
void move_content_later (boost::shared_ptr<Content>);
void set_dcp_content_type (DCPContentType const *);
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_burn_subtitles (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;
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);
- std::string filename_safe_name () const;
void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
+ void audio_analysis_finished ();
/** Log to write to */
boost::shared_ptr<Log> _log;
* must not be relative.
*/
boost::filesystem::path _directory;
-
+
/** Name for DCP-o-matic */
std::string _name;
/** True if a auto-generated ISDCF-compliant name should be used for our DCP */
This will be regardless of what content is on the playlist.
*/
bool _three_d;
- bool _sequence_video;
+ bool _sequence;
bool _interop;
- bool _burn_subtitles;
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;
mutable bool _dirty;
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;
friend struct paths_test;
friend struct film_metadata_test;
projects / dcpomatic.git / blobdiff