X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=dd69c9e68b3b6aaef1bd41a7bc1ab8756160b334;hb=8c365af343a15bee11af53fc6bc16487b83260d1;hp=b77ce7a7651099dfd4334381002613b824207af4;hpb=a9ce4f64658979bc15c301b53c76846072fda0ef;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index b77ce7a76..dd69c9e68 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -200,7 +200,8 @@ public:
 		REEL_TYPE,
 		REEL_LENGTH,
 		UPLOAD_AFTER_MAKE_DCP,
-		REENCODE_J2K
+		REENCODE_J2K,
+		MARKERS
 	};
 
 
@@ -296,6 +297,7 @@ public:
 		return _reencode_j2k;
 	}
 
+	boost::optional<DCPTime> marker (dcp::Marker type) const;
 
 	/* SET */
 
@@ -327,6 +329,8 @@ public:
 	void set_reel_length (int64_t);
 	void set_upload_after_make_dcp (bool);
 	void set_reencode_j2k (bool);
+	void set_marker (dcp::Marker type, DCPTime time);
+	void unset_marker (dcp::Marker type);
 
 	/** Emitted when some property has of the Film is about to change or has changed */
 	mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@ -406,6 +410,7 @@ private:
 	bool _reencode_j2k;
 	/** true if the user has ever explicitly set the video frame rate of this film */
 	bool _user_explicit_video_frame_rate;
+	std::map<dcp::Marker, DCPTime> _markers;
 
 	int _state_version;
 
@@ -414,7 +419,6 @@ 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;