X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=f776a3f72da22a440b8360128405f6384f523cab;hb=1b1bc528ee5ca1fee1bd33f9fb6f79cd551e3b33;hp=0a747193eae4debd6fdab184328fbe2156ddcda5;hpb=f9819a16d40403af3da08263ee6bb3b5a99d650f;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 0a747193e..f776a3f72 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -31,8 +31,8 @@
 #include <boost/signals2.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/key.h>
-#include <libdcp/kdm.h>
+#include <dcp/key.h>
+#include <dcp/kdm.h>
 #include "util.h"
 #include "types.h"
 #include "dci_metadata.h"
@@ -56,7 +56,7 @@ class Screen;
 class Film : public boost::enable_shared_from_this<Film>, public boost::noncopyable
 {
 public:
-	Film (boost::filesystem::path);
+	Film (boost::filesystem::path, bool log = true);
 
 	boost::filesystem::path info_dir () const;
 	boost::filesystem::path j2c_path (int, Eyes, bool) const;
@@ -85,6 +85,7 @@ public:
 
 	void read_metadata ();
 	void write_metadata () const;
+	boost::shared_ptr<xmlpp::Document> metadata () const;
 
 	std::string dci_name (bool if_created_now) const;
 	std::string dcp_name (bool if_created_now = false) const;
@@ -94,19 +95,14 @@ public:
 		return _dirty;
 	}
 
-	libdcp::Size full_frame () const;
+	dcp::Size full_frame () const;
 
 	std::list<boost::filesystem::path> dcps () const;
 
 	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
-	OutputAudioFrame audio_frame_rate () const;
-
-	OutputAudioFrame time_to_audio_frames (Time) const;
-	OutputVideoFrame time_to_video_frames (Time) const;
-	Time video_frames_to_time (OutputVideoFrame) const;
-	Time audio_frames_to_time (OutputAudioFrame) const;
+	int audio_frame_rate () const;
 
 	uint64_t required_disk_space () const;
 	bool should_be_enough_disk_space (double &, double &) const;
@@ -114,29 +110,34 @@ public:
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
-	Time length () const;
+	DCPTime length () const;
 	bool has_subtitles () const;
-	OutputVideoFrame best_video_frame_rate () const;
+	int best_video_frame_rate () const;
+	FrameRateChange active_frame_rate_change (DCPTime) const;
 
-	libdcp::KDM
+	dcp::KDM
 	make_kdm (
-		boost::shared_ptr<libdcp::Certificate> target,
+		boost::shared_ptr<dcp::Certificate> target,
 		boost::filesystem::path dcp,
 		boost::posix_time::ptime from,
 		boost::posix_time::ptime until
 		) const;
 	
-	std::list<libdcp::KDM> make_kdms (
+	std::list<dcp::KDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path dcp,
 		boost::posix_time::ptime from,
 		boost::posix_time::ptime until
 		) const;
 
-	libdcp::Key key () const {
+	dcp::Key key () const {
 		return _key;
 	}
 
+	int state_version () const {
+		return _state_version;
+	}
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -270,7 +271,7 @@ public:
 	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
 
 	/** Current version number of the state file */
-	static int const state_version;
+	static int const current_state_version;
 
 private:
 
@@ -322,7 +323,9 @@ private:
 	bool _three_d;
 	bool _sequence_video;
 	bool _interop;
-	libdcp::Key _key;
+	dcp::Key _key;
+
+	int _state_version;
 
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;