X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=18f826ee6dbe9751f9a3d96efbbdd7373a20326a;hb=53d472f6e4531586fb91e649c386fdfaecb6ecaf;hp=ba998a5ad5f62e414008c0474a56b226849ab142;hpb=0e164ad80f0ceff9d643f3b466690d013c3be19d;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index ba998a5ad..18f826ee6 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -28,9 +28,10 @@
 #define DCPOMATIC_AUDIO_CONTENT_H
 
 
-#include "content_part.h"
-#include "audio_stream.h"
 #include "audio_mapping.h"
+#include "audio_stream.h"
+#include "content_part.h"
+#include "named_channel.h"
 
 
 /** @class AudioContentProperty
@@ -44,6 +45,7 @@ public:
 	static int const DELAY;
 	static int const FADE_IN;
 	static int const FADE_OUT;
+	static int const USE_SAME_FADES_AS_VIDEO;
 };
 
 
@@ -78,18 +80,12 @@ public:
 		return _delay;
 	}
 
-	dcpomatic::ContentTime fade_in () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _fade_in;
-	}
-
-	dcpomatic::ContentTime fade_out () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _fade_out;
-	}
+	dcpomatic::ContentTime fade_in () const;
+	dcpomatic::ContentTime fade_out () const;
 
 	void set_fade_in (dcpomatic::ContentTime time);
 	void set_fade_out (dcpomatic::ContentTime time);
+	void set_use_same_fades_as_video (bool s);
 
 	std::string processing_description (std::shared_ptr<const Film> film) const;
 
@@ -106,7 +102,7 @@ public:
 	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
 	void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
-	void modify_trim_start (dcpomatic::ContentTime& pos) const;
+	void modify_trim_start(std::shared_ptr<const Film> film, dcpomatic::ContentTime& pos) const;
 
 	/** @param frame frame within the whole (untrimmed) content.
 	 *  @param frame_rate The frame rate of the audio (it may have been resampled).
@@ -125,6 +121,7 @@ private:
 	int _delay = 0;
 	dcpomatic::ContentTime _fade_in;
 	dcpomatic::ContentTime _fade_out;
+	bool _use_same_fades_as_video = false;
 	std::vector<AudioStreamPtr> _streams;
 };