X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=18f826ee6dbe9751f9a3d96efbbdd7373a20326a;hb=3f2142a90410755d090ace98ada1fee5a869da98;hp=83a5e327e87c02c0da9f98d987269bd858e72f6d;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 83a5e327e..18f826ee6 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,21 @@
 
 */
 
+
 /** @file  src/lib/audio_content.h
  *  @brief AudioContent and AudioContentProperty classes.
  */
 
+
 #ifndef DCPOMATIC_AUDIO_CONTENT_H
 #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
  *  @brief Names for properties of AudioContent.
@@ -38,13 +43,18 @@ public:
 	static int const STREAMS;
 	static int const GAIN;
 	static int const DELAY;
+	static int const FADE_IN;
+	static int const FADE_OUT;
+	static int const USE_SAME_FADES_AS_VIDEO;
 };
 
+
 class AudioContent : public ContentPart
 {
 public:
 	explicit AudioContent (Content* parent);
-	AudioContent (Content* parent, std::vector<std::shared_ptr<Content> >);
+	AudioContent (Content* parent, std::vector<std::shared_ptr<Content>>);
+	AudioContent (Content* parent, cxml::ConstNodePtr);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
@@ -55,7 +65,9 @@ public:
 	int resampled_frame_rate (std::shared_ptr<const Film> film) const;
 	std::vector<NamedChannel> channel_names () const;
 
+	/** Set gain in dB */
 	void set_gain (double);
+	/** Set delay in milliseconds (positive moves audio later) */
 	void set_delay (int);
 
 	double gain () const {
@@ -68,6 +80,13 @@ public:
 		return _delay;
 	}
 
+	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;
 
 	std::vector<AudioStreamPtr> streams () const {
@@ -83,18 +102,26 @@ 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).
+	 *  @return a fade coefficient for @ref length samples starting at an offset @frame within
+	 *  the content, or an empty vector if the given section has no fade.
+	 */
+	std::vector<float> fade (AudioStreamPtr stream, Frame frame, Frame length, int frame_rate) const;
 
 	static std::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
 
 private:
 
-	AudioContent (Content* parent, cxml::ConstNodePtr);
-
 	/** Gain to apply to audio in dB */
-	double _gain;
+	double _gain = 0;
 	/** Delay to apply to audio (positive moves audio later) in milliseconds */
-	int _delay;
+	int _delay = 0;
+	dcpomatic::ContentTime _fade_in;
+	dcpomatic::ContentTime _fade_out;
+	bool _use_same_fades_as_video = false;
 	std::vector<AudioStreamPtr> _streams;
 };