projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Separate FFmpegSubtitlePeriod.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 8d7d2e0fbdbfa65e96da76bea174e661af56d04f..2165eed23d203d4dd39fb7b0c327e04d604f312a 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-30,7
+30,6
@@
#include "isdcf_metadata.h"
#include "frame_rate_change.h"
#include "signaller.h"
#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 <dcp/key.h>
#include <dcp/encrypted_kdm.h>
#include <boost/signals2.hpp>
@@
-40,6
+39,10
@@
#include <vector>
#include <inttypes.h>
#include <vector>
#include <inttypes.h>
+namespace xmlpp {
+ class Document;
+}
+
class DCPContentType;
class Log;
class Content;
class DCPContentType;
class Log;
class Content;
@@
-48,6
+51,9
@@
class Playlist;
class AudioContent;
class Screen;
class AudioProcessor;
class AudioContent;
class Screen;
class AudioProcessor;
+class AudioMapping;
+class Ratio;
+class Job;
struct isdcf_name_test;
/** @class Film
struct isdcf_name_test;
/** @class Film
@@
-65,9
+71,10
@@
public:
boost::filesystem::path info_file () const;
boost::filesystem::path j2c_path (int, Eyes, bool) const;
boost::filesystem::path info_file () const;
boost::filesystem::path j2c_path (int, Eyes, bool) const;
- boost::filesystem::path internal_video_mxf_dir () const;
- boost::filesystem::path internal_video_mxf_filename () const;
- boost::filesystem::path audio_analysis_dir () const;
+ boost::filesystem::path internal_video_asset_dir () const;
+ boost::filesystem::path internal_video_asset_filename () const;
+
+ boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
void send_dcp_to_tms ();
void make_dcp ();
void send_dcp_to_tms ();
void make_dcp ();
@@
-99,14
+106,11
@@
public:
std::vector<CPLSummary> cpls () 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;
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;
/* Proxies for some Playlist methods */
ContentList content () const;
@@
-122,7
+126,7
@@
public:
dcp::LocalTime until,
dcp::Formulation formulation
) const;
dcp::LocalTime until,
dcp::Formulation formulation
) const;
-
+
std::list<dcp::EncryptedKDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
boost::filesystem::path cpl_file,
std::list<dcp::EncryptedKDM> make_kdms (
std::list<boost::shared_ptr<Screen> >,
boost::filesystem::path cpl_file,
@@
-137,6
+141,15
@@
public:
std::string subtitle_language () const;
std::string subtitle_language () const;
+ void make_audio_mapping_default (AudioMapping & mapping) const;
+ std::vector<std::string> audio_output_names () const;
+
+ void repeat_content (ContentList, int);
+
+ boost::shared_ptr<const Playlist> playlist () const {
+ return _playlist;
+ }
+
/** Identifiers for the parts of our state;
used for signalling changes.
*/
/** Identifiers for the parts of our state;
used for signalling changes.
*/
@@
-160,8
+173,6
@@
public:
THREE_D,
SEQUENCE_VIDEO,
INTEROP,
THREE_D,
SEQUENCE_VIDEO,
INTEROP,
- /** The setting of _burn_subtitles has changed */
- BURN_SUBTITLES,
AUDIO_PROCESSOR,
};
AUDIO_PROCESSOR,
};
@@
-196,7
+207,7
@@
public:
bool is_signed () const {
return _signed;
}
bool is_signed () const {
return _signed;
}
-
+
bool encrypted () const {
return _encrypted;
}
bool encrypted () const {
return _encrypted;
}
@@
-234,14
+245,10
@@
public:
return _interop;
}
return _interop;
}
- bool burn_subtitles () const {
- return _burn_subtitles;
- }
-
AudioProcessor const * audio_processor () const {
return _audio_processor;
}
AudioProcessor const * audio_processor () const {
return _audio_processor;
}
-
+
/* SET */
/* SET */
@@
-252,6
+259,7
@@
public:
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>);
+ 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 move_content_earlier (boost::shared_ptr<Content>);
void move_content_later (boost::shared_ptr<Content>);
void set_dcp_content_type (DCPContentType const *);
@@
-268,14
+276,13
@@
public:
void set_isdcf_date_today ();
void set_sequence_video (bool);
void set_interop (bool);
void set_isdcf_date_today ();
void set_sequence_video (bool);
void set_interop (bool);
- void set_burn_subtitles (bool);
void set_audio_processor (AudioProcessor const * processor);
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
/** Emitted when some property of our content has changed */
void set_audio_processor (AudioProcessor const * processor);
/** Emitted when some property has of the Film has changed */
mutable boost::signals2::signal<void (Property)> Changed;
/** Emitted when some property of our content has changed */
- mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
+ mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int
, bool
)> ContentChanged;
/** Current version number of the state file */
static int const current_state_version;
/** Current version number of the state file */
static int const current_state_version;
@@
-287,8
+294,7
@@
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_content_changed (boost::weak_ptr<Content>, int);
- std::string filename_safe_name () const;
+ void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
/** Log to write to */
void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
/** Log to write to */
@@
-299,7
+305,7
@@
private:
* must not be relative.
*/
boost::filesystem::path _directory;
* 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 */
/** Name for DCP-o-matic */
std::string _name;
/** True if a auto-generated ISDCF-compliant name should be used for our DCP */
@@
-321,7
+327,7
@@
private:
int _video_frame_rate;
/** The date that we should use in a ISDCF name */
boost::gregorian::date _isdcf_date;
int _video_frame_rate;
/** The date that we should use in a ISDCF name */
boost::gregorian::date _isdcf_date;
- /** Number of audio channels
to put in
the DCP */
+ /** Number of audio channels
requested for
the DCP */
int _audio_channels;
/** If true, the DCP will be written in 3D mode; otherwise in 2D.
This will be regardless of what content is on the playlist.
int _audio_channels;
/** If true, the DCP will be written in 3D mode; otherwise in 2D.
This will be regardless of what content is on the playlist.
@@
-329,7
+335,6
@@
private:
bool _three_d;
bool _sequence_video;
bool _interop;
bool _three_d;
bool _sequence_video;
bool _interop;
- bool _burn_subtitles;
AudioProcessor const * _audio_processor;
int _state_version;
AudioProcessor const * _audio_processor;
int _state_version;