X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.h;h=84f0b0233ac6247634a9499b94b2c0cc30f8a934;hb=996b0c06e23bcb6b300d7b8799df94993692e07d;hp=9b01dc6047adfe89a8ff21637c417b11192b5428;hpb=b9f6e9512017dc1ecd3a42aa1ef3c6058608cef5;p=dcpomatic.git

diff --git a/src/lib/film.h b/src/lib/film.h
index 9b01dc604..84f0b0233 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -56,7 +56,7 @@ class Player;
 class Film : public boost::enable_shared_from_this<Film>
 {
 public:
-	Film (std::string d, bool must_exist = true);
+	Film (std::string d);
 	Film (Film const &);
 
 	std::string info_dir () const;
@@ -86,6 +86,7 @@ public:
 	std::string file (std::string f) const;
 	std::string dir (std::string d) const;
 
+	void read_metadata ();
 	void write_metadata () const;
 
 	std::string dci_name (bool if_created_now) const;
@@ -131,11 +132,8 @@ public:
 		LOOP,
 		DCP_CONTENT_TYPE,
 		CONTAINER,
-		FILTERS,
 		SCALER,
 		AB,
-		AUDIO_GAIN,
-		AUDIO_DELAY,
 		WITH_SUBTITLES,
 		SUBTITLE_OFFSET,
 		SUBTITLE_SCALE,
@@ -173,11 +171,6 @@ public:
 		return _container;
 	}
 
-	std::vector<Filter const *> filters () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _filters;
-	}
-
 	Scaler const * scaler () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _scaler;
@@ -188,16 +181,6 @@ public:
 		return _ab;
 	}
 
-	float audio_gain () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _audio_gain;
-	}
-
-	int audio_delay () const {
-		boost::mutex::scoped_lock lm (_state_mutex);
-		return _audio_delay;
-	}
-
 	bool with_subtitles () const {
 		boost::mutex::scoped_lock lm (_state_mutex);
 		return _with_subtitles;
@@ -234,6 +217,11 @@ public:
 		return _dcp_video_frame_rate;
 	}
 
+	int dcp_audio_channels () const {
+		boost::mutex::scoped_lock lm (_state_mutex);
+		return _dcp_audio_channels;
+	}
+
 	/* SET */
 
 	void set_directory (std::string);
@@ -243,11 +231,8 @@ public:
 	void remove_content (boost::shared_ptr<Content>);
 	void set_dcp_content_type (DCPContentType const *);
 	void set_container (Container const *);
-	void set_filters (std::vector<Filter const *>);
 	void set_scaler (Scaler const *);
 	void set_ab (bool);
-	void set_audio_gain (float);
-	void set_audio_delay (int);
 	void set_with_subtitles (bool);
 	void set_subtitle_offset (int);
 	void set_subtitle_scale (float);
@@ -273,7 +258,6 @@ private:
 	void signal_changed (Property);
 	void analyse_audio_finished ();
 	std::string video_state_identifier () const;
-	void read_metadata ();
 	void playlist_changed ();
 	void playlist_content_changed (boost::weak_ptr<Content>, int);
 	std::string filename_safe_name () const;
@@ -299,8 +283,6 @@ private:
 	DCPContentType const * _dcp_content_type;
 	/** The container to put this Film in (flat, scope, etc.) */
 	Container const * _container;
-	/** Video filters that should be used when generating DCPs */
-	std::vector<Filter const *> _filters;
 	/** Scaler algorithm to use */
 	Scaler const * _scaler;
 	/** true to create an A/B comparison DCP, where the left half of the image
@@ -308,10 +290,6 @@ private:
 	    has the specified filters and post-processing.
 	*/
 	bool _ab;
-	/** Gain to apply to audio in dB */
-	float _audio_gain;
-	/** Delay to apply to audio (positive moves audio later) in milliseconds */
-	int _audio_delay;
 	/** True if subtitles should be shown for this film */
 	bool _with_subtitles;
 	/** y offset for placing subtitles, in source pixels; +ve is further down
@@ -333,6 +311,7 @@ private:
 	int _dcp_video_frame_rate;
 	/** The date that we should use in a DCI name */
 	boost::gregorian::date _dci_date;
+	int _dcp_audio_channels;
 
 	/** true if our state has changed since we last saved it */
 	mutable bool _dirty;