X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=3b33aa3058d3c37eb707a1f48b60db3190dd9cee;hb=78012b8cf9b4c6e35b425c97b6432551ce635c3a;hp=17bdd09ebc35aaeaf0b9670d75d89736535d7cfc;hpb=ba6c93aab4cc43d62f6becc62485d982af7f4a3f;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 17bdd09eb..3b33aa305 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,19 +1,20 @@
 /*
-    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
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -132,8 +133,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 +155,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 +166,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 +180,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 +249,8 @@ public:
 		return _three_d;
 	}
 
-	bool sequence_video () const {
-		return _sequence_video;
+	bool sequence () const {
+		return _sequence;
 	}
 
 	bool interop () const {
@@ -263,6 +269,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 +297,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 +320,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,12 +361,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;
 
@@ -362,6 +375,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;