X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=adc4b0eec65137c22a2c2b6318dd65b6bdb8b090;hb=ba0a895137b630f5d308b123ef886d68090f855d;hp=cc77460db5f874dd5a9e07913b9936089352a5b8;hpb=106c8fb2d471cb0b01da3b6b09e743304a869f4b;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index cc77460db..adc4b0eec 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -45,6 +45,7 @@ class Job;
 class Filter;
 class Log;
 class ExamineContentJob;
+class AnalyseAudioJob;
 class ExternalAudioStream;
 
 /** @class Film
@@ -65,16 +66,18 @@ public:
 	std::string info_path (int f) const;
 	std::string video_mxf_dir () const;
 	std::string video_mxf_filename () const;
+	std::string audio_analysis_path () const;
 
 	void examine_content ();
+	void analyse_audio ();
 	void send_dcp_to_tms ();
 
-	void make_dcp (bool);
+	void make_dcp ();
 
 	/** @return Logger.
 	 *  It is safe to call this from any thread.
 	 */
-	Log* log () const {
+	boost::shared_ptr<Log> log () const {
 		return _log;
 	}
 
@@ -95,10 +98,6 @@ public:
 	std::string dci_name (bool if_created_now) const;
 	std::string dcp_name (bool if_created_now = false) const;
 
-	boost::optional<int> dcp_intrinsic_duration () const {
-		return _dcp_intrinsic_duration;
-	}
-
 	/** @return true if our state has changed since we last saved it */
 	bool dirty () const {
 		return _dirty;
@@ -142,10 +141,10 @@ public:
 		DCI_METADATA,
 		SIZE,
 		LENGTH,
-		DCP_INTRINSIC_DURATION,
 		CONTENT_AUDIO_STREAMS,
 		SUBTITLE_STREAMS,
-		FRAMES_PER_SECOND,
+		SOURCE_FRAME_RATE,
+		DCP_FRAME_RATE
 	};
 
 
@@ -282,6 +281,11 @@ public:
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _dci_metadata;
 	}
+
+	int dcp_frame_rate () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _dcp_frame_rate;
+	}
 	
 	libdcp::Size size () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
@@ -308,17 +312,17 @@ public:
 		return _subtitle_streams;
 	}
 	
-	float frames_per_second () const {
+	float source_frame_rate () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		if (content_type() == STILL) {
 			return 24;
 		}
 		
-		return _frames_per_second;
+		return _source_frame_rate;
 	}
 
 	boost::shared_ptr<AudioStream> audio_stream () const;
-
+	bool has_audio () const;
 	
 	/* SET */
 
@@ -352,31 +356,36 @@ public:
 	void set_colour_lut (int);
 	void set_j2k_bandwidth (int);
 	void set_dci_metadata (DCIMetadata);
+	void set_dcp_frame_rate (int);
 	void set_size (libdcp::Size);
 	void set_length (SourceFrame);
 	void unset_length ();
-	void set_dcp_intrinsic_duration (int);
 	void set_content_digest (std::string);
 	void set_content_audio_streams (std::vector<boost::shared_ptr<AudioStream> >);
 	void set_subtitle_streams (std::vector<boost::shared_ptr<SubtitleStream> >);
-	void set_frames_per_second (float);
+	void set_source_frame_rate (float);
 
 	/** Emitted when some property has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
 
+	boost::signals2::signal<void ()> AudioAnalysisSucceeded;
+
 	/** Current version number of the state file */
 	static int const state_version;
 
 private:
 	
 	/** Log to write to */
-	Log* _log;
+	boost::shared_ptr<Log> _log;
 
 	/** Any running ExamineContentJob, or 0 */
 	boost::shared_ptr<ExamineContentJob> _examine_content_job;
+	/** Any running AnalyseAudioJob, or 0 */
+	boost::shared_ptr<AnalyseAudioJob> _analyse_audio_job;
 
 	void signal_changed (Property);
 	void examine_content_finished ();
+	void analyse_audio_finished ();
 	std::string video_state_identifier () const;
 
 	/** Complete path to directory containing the film metadata;
@@ -453,6 +462,8 @@ private:
 	DCIMetadata _dci_metadata;
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
+	/** Frames per second to run our DCP at */
+	int _dcp_frame_rate;
 
 	/* Data which are cached to speed things up */
 
@@ -460,17 +471,16 @@ private:
 	libdcp::Size _size;
 	/** The length of the source, in video frames (as far as we know) */
 	boost::optional<SourceFrame> _length;
-	boost::optional<int> _dcp_intrinsic_duration;
 	/** MD5 digest of our content file */
 	std::string _content_digest;
 	/** The audio streams in our content */
 	std::vector<boost::shared_ptr<AudioStream> > _content_audio_streams;
 	/** A stream to represent possible external audio (will always exist) */
-	boost::shared_ptr<AudioStream> _external_audio_stream;
+	boost::shared_ptr<AudioStream> _sndfile_stream;
 	/** the subtitle streams that we can use */
 	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 	/** Frames per second of the source */
-	float _frames_per_second;
+	float _source_frame_rate;
 
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;