X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=9d1445d927b81ab7333f3197d2891ef1306de809;hp=51e272faa2379c778736a3cb984c862415f7c62e;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=58588c485eac7c488a574fe923576f109ec0134e

diff --git a/src/lib/film.h b/src/lib/film.h
index 51e272faa..9d1445d92 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -63,7 +63,7 @@ public:
 	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,7 +83,7 @@ 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;
 
@@ -96,18 +96,14 @@ public:
 	}
 
 	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;
@@ -117,7 +113,7 @@ 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;
 
 	dcp::KDM