X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=f55d8182fe0f7dfffbf2c23b1606800d8bf03bcc;hb=5ae794047e5ceee4502e59211f0083a60224f4bd;hp=1906de91b19bc94674c86b6b5e0612687791046d;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 1906de91b..f55d8182f 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -25,19 +25,20 @@
 #ifndef DCPOMATIC_FILM_H
 #define DCPOMATIC_FILM_H
 
-#include <string>
-#include <vector>
-#include <inttypes.h>
-#include <boost/signals2.hpp>
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/key.h>
-#include <dcp/decrypted_kdm.h>
-#include <dcp/encrypted_kdm.h>
 #include "util.h"
 #include "types.h"
 #include "isdcf_metadata.h"
 #include "frame_rate_change.h"
+#include "signaller.h"
+#include "ratio.h"
+#include <dcp/key.h>
+#include <dcp/encrypted_kdm.h>
+#include <boost/signals2.hpp>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/filesystem.hpp>
+#include <string>
+#include <vector>
+#include <inttypes.h>
 
 class DCPContentType;
 class Log;
@@ -45,7 +46,6 @@ class Content;
 class Player;
 class Playlist;
 class AudioContent;
-class Scaler;
 class Screen;
 struct isdcf_name_test;
 
@@ -56,22 +56,18 @@ struct isdcf_name_test;
  *
  *  The content of a Film is held in a Playlist (created and managed by the Film).
  */
-class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
+class Film : public boost::enable_shared_from_this<Film>, public Signaller, public boost::noncopyable
 {
 public:
 	Film (boost::filesystem::path, bool log = true);
+	~Film ();
 
-	boost::filesystem::path info_dir () const;
+	boost::filesystem::path info_file () const;
 	boost::filesystem::path j2c_path (int, Eyes, bool) const;
-	boost::filesystem::path info_path (int, Eyes) const;
 	boost::filesystem::path internal_video_mxf_dir () const;
 	boost::filesystem::path internal_video_mxf_filename () const;
 	boost::filesystem::path audio_analysis_dir () const;
 
-	boost::filesystem::path video_mxf_filename () const;
-	boost::filesystem::path audio_mxf_filename () const;
-	boost::filesystem::path subtitle_xml_filename () const;
-
 	void send_dcp_to_tms ();
 	void make_dcp ();
 
@@ -82,8 +78,6 @@ public:
 		return _log;
 	}
 
-	int encoded_frames () const;
-	
 	boost::filesystem::path file (boost::filesystem::path f) const;
 	boost::filesystem::path dir (boost::filesystem::path d) const;
 
@@ -110,7 +104,7 @@ public:
 	int audio_frame_rate () const;
 
 	uint64_t required_disk_space () const;
-	bool should_be_enough_disk_space (double &, double &) const;
+	bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
 	
 	/* Proxies for some Playlist methods */
 
@@ -136,14 +130,12 @@ public:
 		dcp::Formulation formulation
 		) const;
 
-	dcp::Key key () const {
-		return _key;
-	}
-
 	int state_version () const {
 		return _state_version;
 	}
 
+	std::string subtitle_language () const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -156,9 +148,9 @@ public:
 		DCP_CONTENT_TYPE,
 		CONTAINER,
 		RESOLUTION,
-		SCALER,
 		SIGNED,
 		ENCRYPTED,
+		KEY,
 		J2K_BANDWIDTH,
 		ISDCF_METADATA,
 		VIDEO_FRAME_RATE,
@@ -198,10 +190,6 @@ public:
 		return _resolution;
 	}
 
-	Scaler const * scaler () const {
-		return _scaler;
-	}
-
 	/* signed is a reserved word */
 	bool is_signed () const {
 		return _signed;
@@ -211,6 +199,10 @@ public:
 		return _encrypted;
 	}
 
+	dcp::Key key () const {
+		return _key;
+	}
+
 	int j2k_bandwidth () const {
 		return _j2k_bandwidth;
 	}
@@ -250,8 +242,8 @@ public:
 	void set_directory (boost::filesystem::path);
 	void set_name (std::string);
 	void set_use_isdcf_name (bool);
-	void examine_content (boost::shared_ptr<Content>, bool calculate_digest);
-	void examine_and_add_content (boost::shared_ptr<Content>, bool calculate_digest);
+	void examine_content (boost::shared_ptr<Content>);
+	void examine_and_add_content (boost::shared_ptr<Content>);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
 	void move_content_earlier (boost::shared_ptr<Content>);
@@ -259,9 +251,9 @@ public:
 	void set_dcp_content_type (DCPContentType const *);
 	void set_container (Ratio const *);
 	void set_resolution (Resolution);
-	void set_scaler (Scaler const *);
 	void set_signed (bool);
 	void set_encrypted (bool);
+	void set_key (dcp::Key key);
 	void set_j2k_bandwidth (int);
 	void set_isdcf_metadata (ISDCFMetadata);
 	void set_video_frame_rate (int);
@@ -311,8 +303,6 @@ private:
 	Ratio const * _container;
 	/** DCP resolution (2K or 4K) */
 	Resolution _resolution;
-	/** Scaler algorithm to use */
-	Scaler const * _scaler;
 	bool _signed;
 	bool _encrypted;
 	/** bandwidth for J2K files in bits per second */
@@ -339,6 +329,10 @@ private:
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;
 
+	boost::signals2::scoped_connection _playlist_changed_connection;
+	boost::signals2::scoped_connection _playlist_content_changed_connection;
+	std::list<boost::signals2::connection> _job_connections;
+
 	friend struct paths_test;
 	friend struct film_metadata_test;
 };