X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=ac25323b932cae277acb3e149b9f4c9108ca144b;hb=a193afb89de3e335612e07a3fbec3e4095f14f98;hp=6008160cd36682ed8fa5b0f69a8ad2c0a54115f5;hpb=fa61fc99549264810e17fcd35abffe9e8ddab5b2;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 6008160cd..ac25323b9 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -66,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 ();
@@ -100,7 +101,6 @@ public:
 
 	std::vector<CPLSummary> cpls () const;
 
-	boost::shared_ptr<Player> make_player () const;
 	boost::shared_ptr<Playlist> playlist () const;
 
 	int audio_frame_rate () const;
@@ -279,7 +279,7 @@ public:
 	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;
@@ -291,7 +291,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>);
 
@@ -325,7 +325,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.