X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=5318d6a12aa837229d4e4ea6ff94ffe1a958fdb8;hb=1a721b82d4094c00ee89574e17c58c23c0de8cdd;hp=a2e0c8b60e6be2a198bd788365664879876491cc;hpb=cac7313566d2524f28449bad56bda3f03af3c3a4;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index a2e0c8b60..5318d6a12 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -18,23 +18,29 @@
 
 */
 
+
 /** @file  src/film.h
  *  @brief A representation of some audio and video content, and details of
  *  how they should be presented in a DCP.
  */
 
+
 #ifndef DCPOMATIC_FILM_H
 #define DCPOMATIC_FILM_H
 
+
 #include "change_signaller.h"
 #include "dcp_text_track.h"
 #include "frame_rate_change.h"
 #include "signaller.h"
+#include "transcode_job.h"
 #include "types.h"
 #include "util.h"
 #include <dcp/encrypted_kdm.h>
+#include <dcp/file.h>
 #include <dcp/key.h>
 #include <dcp/language_tag.h>
+#include <dcp/rating.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread.hpp>
@@ -43,6 +49,7 @@
 #include <string>
 #include <vector>
 
+
 namespace xmlpp {
 	class Document;
 }
@@ -64,17 +71,13 @@ struct isdcf_name_test;
 struct recover_test_2d_encrypted;
 struct atmos_encrypted_passthrough_test;
 
+
 class InfoFileHandle
 {
 public:
 	InfoFileHandle (boost::mutex& mutex, boost::filesystem::path file, bool read);
-	~InfoFileHandle ();
 
-	FILE* get () const {
-		return _handle;
-	}
-
-	boost::filesystem::path file () const {
+	dcp::File& get () {
 		return _file;
 	}
 
@@ -82,10 +85,10 @@ private:
 	friend class Film;
 
 	boost::mutex::scoped_lock _lock;
-	FILE* _handle;
-	boost::filesystem::path _file;
+	dcp::File _file;
 };
 
+
 /** @class Film
  *
  *  @brief A representation of some audio, video, subtitle and closed-caption content,
@@ -111,7 +114,6 @@ public:
 	boost::filesystem::path subtitle_analysis_path (std::shared_ptr<const Content>) const;
 
 	void send_dcp_to_tms ();
-	void make_dcp (bool gui = false, bool check = true);
 
 	/** @return Logger.
 	 *  It is safe to call this from any thread.
@@ -125,7 +127,7 @@ public:
 
 	void use_template (std::string name);
 	std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
-	void write_metadata () const;
+	void write_metadata ();
 	void write_metadata (boost::filesystem::path path) const;
 	void write_template (boost::filesystem::path path) const;
 	std::shared_ptr<xmlpp::Document> metadata (bool with_content_paths = true) const;
@@ -146,13 +148,13 @@ public:
 
 	std::vector<CPLSummary> cpls () const;
 
-	int audio_frame_rate () const;
-
 	std::list<DCPTextTrack> closed_caption_tracks () const;
 
 	uint64_t required_disk_space () const;
 	bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
 
+	bool has_sign_language_video_channel () const;
+
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
@@ -225,6 +227,7 @@ public:
 		ENCRYPTED,
 		J2K_BANDWIDTH,
 		VIDEO_FRAME_RATE,
+		AUDIO_FRAME_RATE,
 		AUDIO_CHANNELS,
 		/** The setting of _three_d has changed */
 		THREE_D,
@@ -240,6 +243,7 @@ public:
 		NAME_LANGUAGE,
 		AUDIO_LANGUAGE,
 		RELEASE_TERRITORY,
+		SIGN_LANGUAGE_VIDEO_LANGUAGE,
 		VERSION_NUMBER,
 		STATUS,
 		CHAIN,
@@ -356,6 +360,10 @@ public:
 		return _release_territory;
 	}
 
+	boost::optional<dcp::LanguageTag> sign_language_video_language () const {
+		return _sign_language_video_language;
+	}
+
 	int version_number () const {
 		return _version_number;
 	}
@@ -400,6 +408,13 @@ public:
 		return _luminance;
 	}
 
+	boost::gregorian::date isdcf_date () const {
+		return _isdcf_date;
+	}
+
+	int audio_frame_rate () const {
+		return _audio_frame_rate;
+	}
 
 	/* SET */
 
@@ -434,6 +449,7 @@ public:
 	void set_content_versions (std::vector<std::string> v);
 	void set_name_language (dcp::LanguageTag lang);
 	void set_release_territory (boost::optional<dcp::LanguageTag::RegionSubtag> region = boost::none);
+	void set_sign_language_video_language (boost::optional<dcp::LanguageTag> tag);
 	void set_version_number (int v);
 	void set_status (dcp::Status s);
 	void set_chain (boost::optional<std::string> c = boost::none);
@@ -446,6 +462,7 @@ public:
 	void set_distributor (boost::optional<std::string> d = boost::none);
 	void set_luminance (boost::optional<dcp::Luminance> l = boost::none);
 	void set_audio_language (boost::optional<dcp::LanguageTag> language);
+	void set_audio_frame_rate (int rate);
 
 	void add_ffoc_lfoc (Markers& markers) const;
 
@@ -460,6 +477,8 @@ public:
 	*/
 	mutable boost::signals2::signal<void ()> LengthChange;
 
+	boost::signals2::signal<void (bool)> DirtyChange;
+
 	/** Emitted when we have something important to tell the user */
 	boost::signals2::signal<void (std::string)> Message;
 
@@ -486,8 +505,7 @@ private:
 	void audio_analysis_finished ();
 	void check_settings_consistency ();
 	void maybe_set_container_and_resolution ();
-
-	static std::string const metadata_file;
+	void set_dirty (bool dirty);
 
 	/** Log to write to */
 	std::shared_ptr<Log> _log;
@@ -542,6 +560,7 @@ private:
 	std::vector<std::string> _content_versions;
 	dcp::LanguageTag _name_language;
 	boost::optional<dcp::LanguageTag::RegionSubtag> _release_territory;
+	boost::optional<dcp::LanguageTag> _sign_language_video_language;
 	int _version_number;
 	dcp::Status _status;
 	boost::optional<std::string> _chain;
@@ -554,6 +573,7 @@ private:
 	bool _two_d_version_of_three_d = false;
 	boost::optional<dcp::Luminance> _luminance;
 	boost::optional<dcp::LanguageTag> _audio_language;
+	int _audio_frame_rate = 48000;
 
 	int _state_version;