summaryrefslogtreecommitdiff
path: root/src/lib/film.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-01-26 22:44:08 +0000
committerCarl Hetherington <cth@carlh.net>2019-01-26 22:44:08 +0000
commit078a0f98e3f741210be7f839292f41f28b6a403e (patch)
tree08d3e0a8eb93717ddd1ca1f969cff80e7c4ea48e /src/lib/film.h
parent755b9af051c73dae5fffbe613fc45d9fd4fbd08d (diff)
Suggest that DCP rates <= 30 are used unless the user explictly goes higher (#1441).
Diffstat (limited to 'src/lib/film.h')
-rw-r--r--src/lib/film.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/film.h b/src/lib/film.h
index 3fb24af93..7fdd4d269 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -316,7 +316,7 @@ public:
void set_key (dcp::Key key);
void set_j2k_bandwidth (int);
void set_isdcf_metadata (ISDCFMetadata);
- void set_video_frame_rate (int);
+ void set_video_frame_rate (int rate, bool user_explicit = false);
void set_audio_channels (int);
void set_three_d (bool);
void set_isdcf_date_today ();
@@ -401,6 +401,8 @@ private:
int64_t _reel_length;
bool _upload_after_make_dcp;
bool _reencode_j2k;
+ /** true if the user has ever explicitly set the video frame rate of this film */
+ bool _user_explicit_video_frame_rate;
int _state_version;
@@ -409,6 +411,7 @@ private:
/** 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;