X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=b77ce7a7651099dfd4334381002613b824207af4;hb=9fa17d52810490359f899cc0cbdb4c25ac74bc92;hp=3fb24af934e5c999f84b4d49d55e1427b85c9808;hpb=e13e5cd4cfda39b0a0b77ed8036e14e15f93ec2e;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 3fb24af93..b77ce7a76 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 ();
@@ -334,6 +334,9 @@ public:
 	/** Emitted when some property of our content has changed */
 	mutable boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> ContentChange;
 
+	/** Emitted when we have something important to tell the user */
+	boost::signals2::signal<void (std::string)> Message;
+
 	/** Current version number of the state file */
 	static int const current_state_version;
 
@@ -401,6 +404,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 +414,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;