X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=96a79f9cf5abfd6179922da03e376e0a2aac472c;hb=20eea989f452ea1a6af0af6b5c5b504d3b19480c;hp=f55d8182fe0f7dfffbf2c23b1606800d8bf03bcc;hpb=5ae794047e5ceee4502e59211f0083a60224f4bd;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index f55d8182f..96a79f9cf 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,6 +47,8 @@ class Player;
 class Playlist;
 class AudioContent;
 class Screen;
+class AudioProcessor;
+class AudioMapping;
 struct isdcf_name_test;
 
 /** @class Film
@@ -64,9 +66,10 @@ public:
 
 	boost::filesystem::path info_file () const;
 	boost::filesystem::path j2c_path (int, Eyes, bool) const;
-	boost::filesystem::path internal_video_mxf_dir () const;
-	boost::filesystem::path internal_video_mxf_filename () const;
-	boost::filesystem::path audio_analysis_dir () const;
+	boost::filesystem::path internal_video_asset_dir () const;
+	boost::filesystem::path internal_video_asset_filename () const;
+
+	boost::filesystem::path audio_analysis_path (boost::shared_ptr<const Playlist>) const;
 
 	void send_dcp_to_tms ();
 	void make_dcp ();
@@ -136,6 +139,9 @@ public:
 
 	std::string subtitle_language () const;
 
+	void make_audio_mapping_default (AudioMapping & mapping) const;
+	std::vector<std::string> audio_output_names () const;
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -161,6 +167,7 @@ public:
 		INTEROP,
 		/** The setting of _burn_subtitles has changed */
 		BURN_SUBTITLES,
+		AUDIO_PROCESSOR,
 	};
 
 
@@ -235,6 +242,10 @@ public:
 	bool burn_subtitles () const {
 		return _burn_subtitles;
 	}
+
+	AudioProcessor const * audio_processor () const {
+		return _audio_processor;
+	}
 	
 
 	/* SET */
@@ -263,6 +274,7 @@ public:
 	void set_sequence_video (bool);
 	void set_interop (bool);
 	void set_burn_subtitles (bool);
+	void set_audio_processor (AudioProcessor const * processor);
 
 	/** Emitted when some property has of the Film has changed */
 	mutable boost::signals2::signal<void (Property)> Changed;
@@ -305,6 +317,7 @@ private:
 	Resolution _resolution;
 	bool _signed;
 	bool _encrypted;
+	dcp::Key _key;
 	/** bandwidth for J2K files in bits per second */
 	int _j2k_bandwidth;
 	/** ISDCF naming stuff */
@@ -313,7 +326,7 @@ private:
 	int _video_frame_rate;
 	/** The date that we should use in a ISDCF name */
 	boost::gregorian::date _isdcf_date;
-	/** Number of audio channels to put in the DCP */
+	/** Number of audio channels requested for the DCP */
 	int _audio_channels;
 	/** If true, the DCP will be written in 3D mode; otherwise in 2D.
 	    This will be regardless of what content is on the playlist.
@@ -322,7 +335,7 @@ private:
 	bool _sequence_video;
 	bool _interop;
 	bool _burn_subtitles;
-	dcp::Key _key;
+	AudioProcessor const * _audio_processor;
 
 	int _state_version;