X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Ffilm.h;h=9d1445d927b81ab7333f3197d2891ef1306de809;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=5d83ec6edaa484c19192f1874448810711588741;hpb=4ba8772aef261da209bbb882325fd61a8b479fd7;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 5d83ec6ed..9d1445d92 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,14 +56,14 @@ 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;
 	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_path (boost::shared_ptr<const AudioContent>) const;
+	boost::filesystem::path audio_analysis_dir () const;
 
 	boost::filesystem::path video_mxf_filename () const;
 	boost::filesystem::path audio_mxf_filename () const;
@@ -83,8 +83,9 @@ public:
 	boost::filesystem::path file (boost::filesystem::path f) const;
 	boost::filesystem::path dir (boost::filesystem::path d) const;
 
-	void read_metadata ();
+	std::list<std::string> 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,15 @@ public:
 		return _dirty;
 	}
 
-	libdcp::Size full_frame () const;
+	dcp::Size full_frame () const;
+	dcp::Size frame_size () const;
 
 	std::list<boost::filesystem::path> dcps () const;
 
 	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
-	AudioFrame audio_frame_rate () const;
-
-	AudioFrame time_to_audio_frames (DCPTime) const;
-	VideoFrame time_to_video_frames (DCPTime) const;
-	DCPTime video_frames_to_time (VideoFrame) const;
-	DCPTime audio_frames_to_time (AudioFrame) const;
+	int audio_frame_rate () const;
 
 	uint64_t required_disk_space () const;
 	bool should_be_enough_disk_space (double &, double &) const;
@@ -116,28 +113,32 @@ public:
 	ContentList content () const;
 	DCPTime length () const;
 	bool has_subtitles () const;
-	VideoFrame 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.
 	*/
@@ -271,7 +272,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:
 
@@ -323,7 +324,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;