X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=4ad905758b2dca65dc5333f0103990304913b0c5;hb=cc76b517f6a74f813ae38137bdc88ff3bafa6dd9;hp=faa7cf5baf366f23620ab43234412415cb2a017a;hpb=69f25e496ba409c02aa27b1e07dfcde34c86a32b;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index faa7cf5ba..4ad905758 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -132,8 +132,8 @@ public:
 	std::list<ScreenKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path cpl_file,
-		dcp::LocalTime from,
-		dcp::LocalTime until,
+		boost::posix_time::ptime from,
+		boost::posix_time::ptime until,
 		dcp::Formulation formulation
 		) const;
 
@@ -154,6 +154,8 @@ public:
 
 	std::list<DCPTimePeriod> reels () const;
 
+	std::list<int> mapped_audio_channels () const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -163,6 +165,8 @@ public:
 		USE_ISDCF_NAME,
 		/** The playlist's content list has changed (i.e. content has been added or removed) */
 		CONTENT,
+		/** The order of content in the playlist has changed */
+		CONTENT_ORDER,
 		DCP_CONTENT_TYPE,
 		CONTAINER,
 		RESOLUTION,
@@ -175,11 +179,12 @@ public:
 		AUDIO_CHANNELS,
 		/** The setting of _three_d has changed */
 		THREE_D,
-		SEQUENCE_VIDEO,
+		SEQUENCE,
 		INTEROP,
 		AUDIO_PROCESSOR,
 		REEL_TYPE,
-		REEL_LENGTH
+		REEL_LENGTH,
+		UPLOAD_AFTER_MAKE_DCP
 	};
 
 
@@ -243,8 +248,8 @@ public:
 		return _three_d;
 	}
 
-	bool sequence_video () const {
-		return _sequence_video;
+	bool sequence () const {
+		return _sequence;
 	}
 
 	bool interop () const {
@@ -263,6 +268,10 @@ public:
 		return _reel_length;
 	}
 
+	bool upload_after_make_dcp () const {
+		return _upload_after_make_dcp;
+	}
+
 	/* SET */
 
 	void set_directory (boost::filesystem::path);
@@ -287,11 +296,12 @@ public:
 	void set_audio_channels (int);
 	void set_three_d (bool);
 	void set_isdcf_date_today ();
-	void set_sequence_video (bool);
+	void set_sequence (bool);
 	void set_interop (bool);
 	void set_audio_processor (AudioProcessor const * processor);
 	void set_reel_type (ReelType);
 	void set_reel_length (int64_t);
+	void set_upload_after_make_dcp (bool);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -309,6 +319,7 @@ private:
 	void signal_changed (Property);
 	std::string video_identifier () const;
 	void playlist_changed ();
+	void playlist_order_changed ();
 	void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 	void audio_analysis_finished ();
@@ -349,11 +360,13 @@ private:
 	    This will be regardless of what content is on the playlist.
 	*/
 	bool _three_d;
-	bool _sequence_video;
+	bool _sequence;
 	bool _interop;
 	AudioProcessor const * _audio_processor;
 	ReelType _reel_type;
+	/** Desired reel length in bytes, if _reel_type == REELTYPE_BY_LENGTH */
 	int64_t _reel_length;
+	bool _upload_after_make_dcp;
 
 	int _state_version;
 
@@ -361,6 +374,7 @@ private:
 	mutable bool _dirty;
 
 	boost::signals2::scoped_connection _playlist_changed_connection;
+	boost::signals2::scoped_connection _playlist_order_changed_connection;
 	boost::signals2::scoped_connection _playlist_content_changed_connection;
 	std::list<boost::signals2::connection> _job_connections;
 	std::list<boost::signals2::connection> _audio_analysis_connections;