projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 178fd9002d18cff8b586790d5d14c473e796374b..6c3f78895791221297b500ea64b1b4ea730777af 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-70,6
+70,7
@@
public:
boost::filesystem::path video_mxf_filename () const;
boost::filesystem::path audio_mxf_filename () const;
boost::filesystem::path video_mxf_filename () const;
boost::filesystem::path audio_mxf_filename () const;
+ boost::filesystem::path subtitle_xml_filename () const;
void send_dcp_to_tms ();
void make_dcp ();
void send_dcp_to_tms ();
void make_dcp ();
@@
-162,10
+163,12
@@
public:
ISDCF_METADATA,
VIDEO_FRAME_RATE,
AUDIO_CHANNELS,
ISDCF_METADATA,
VIDEO_FRAME_RATE,
AUDIO_CHANNELS,
- /** The setting of _three_d has
been
changed */
+ /** The setting of _three_d has changed */
THREE_D,
SEQUENCE_VIDEO,
INTEROP,
THREE_D,
SEQUENCE_VIDEO,
INTEROP,
+ /** The setting of _burn_subtitles has changed */
+ BURN_SUBTITLES,
};
};
@@
-236,6
+239,10
@@
public:
bool interop () const {
return _interop;
}
bool interop () const {
return _interop;
}
+
+ bool burn_subtitles () const {
+ return _burn_subtitles;
+ }
/* SET */
/* SET */
@@
-262,6
+269,7
@@
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);
/** 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;
@@
-322,6
+330,7
@@
private:
bool _three_d;
bool _sequence_video;
bool _interop;
bool _three_d;
bool _sequence_video;
bool _interop;
+ bool _burn_subtitles;
dcp::Key _key;
int _state_version;
dcp::Key _key;
int _state_version;