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

diff --git a/src/lib/film.h b/src/lib/film.h
index f55d8182f..5e4c01c86 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 () const;
 
 	void send_dcp_to_tms ();
 	void make_dcp ();
@@ -98,14 +101,11 @@ public:
 
 	std::vector<CPLSummary> cpls () const;
 
-	boost::shared_ptr<Player> make_player () const;
-	boost::shared_ptr<Playlist> playlist () const;
-
 	int audio_frame_rate () const;
 
 	uint64_t required_disk_space () const;
 	bool should_be_enough_disk_space (double& required, double& available, bool& can_hard_link) const;
-	
+
 	/* Proxies for some Playlist methods */
 
 	ContentList content () const;
@@ -121,7 +121,7 @@ public:
 		dcp::LocalTime until,
 		dcp::Formulation formulation
 		) const;
-	
+
 	std::list<dcp::EncryptedKDM> make_kdms (
 		std::list<boost::shared_ptr<Screen> >,
 		boost::filesystem::path cpl_file,
@@ -136,6 +136,11 @@ public:
 
 	std::string subtitle_language () const;
 
+	void make_audio_mapping_default (AudioMapping & mapping) const;
+	std::vector<std::string> audio_output_names () const;
+
+	void repeat_content (ContentList, int);
+
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
 	*/
@@ -161,6 +166,7 @@ public:
 		INTEROP,
 		/** The setting of _burn_subtitles has changed */
 		BURN_SUBTITLES,
+		AUDIO_PROCESSOR,
 	};
 
 
@@ -194,7 +200,7 @@ public:
 	bool is_signed () const {
 		return _signed;
 	}
-	
+
 	bool encrypted () const {
 		return _encrypted;
 	}
@@ -235,7 +241,11 @@ public:
 	bool burn_subtitles () const {
 		return _burn_subtitles;
 	}
-	
+
+	AudioProcessor const * audio_processor () const {
+		return _audio_processor;
+	}
+
 
 	/* SET */
 
@@ -246,6 +256,7 @@ public:
 	void examine_and_add_content (boost::shared_ptr<Content>);
 	void add_content (boost::shared_ptr<Content>);
 	void remove_content (boost::shared_ptr<Content>);
+	void remove_content (ContentList);
 	void move_content_earlier (boost::shared_ptr<Content>);
 	void move_content_later (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
@@ -263,12 +274,13 @@ 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;
 
 	/** Emitted when some property of our content has changed */
-	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int)> ContentChanged;
+	mutable boost::signals2::signal<void (boost::weak_ptr<Content>, int, bool)> ContentChanged;
 
 	/** Current version number of the state file */
 	static int const current_state_version;
@@ -280,7 +292,7 @@ private:
 	void signal_changed (Property);
 	std::string video_identifier () const;
 	void playlist_changed ();
-	void playlist_content_changed (boost::weak_ptr<Content>, int);
+	void playlist_content_changed (boost::weak_ptr<Content>, int, bool frequent);
 	std::string filename_safe_name () const;
 	void maybe_add_content (boost::weak_ptr<Job>, boost::weak_ptr<Content>);
 
@@ -292,7 +304,7 @@ private:
 	 *  must not be relative.
 	 */
 	boost::filesystem::path _directory;
-	
+
 	/** Name for DCP-o-matic */
 	std::string _name;
 	/** True if a auto-generated ISDCF-compliant name should be used for our DCP */
@@ -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;