X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=82a9de04171ef85a6719f6e229c0451ab7088657;hb=fe933ebb2c55b4235fcba5d02af2ba91c272fc88;hp=051fc8db8941f137fdd54d90f457dd709204aa42;hpb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 051fc8db8..82a9de041 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,17 +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"
 
+
 /** @class AudioContentProperty
  *  @brief Names for properties of AudioContent.
  */
@@ -38,25 +42,31 @@ 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<boost::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;
-	void take_settings_from (boost::shared_ptr<const AudioContent> c);
+	void take_settings_from (std::shared_ptr<const AudioContent> c);
 
 	AudioMapping mapping () const;
 	void set_mapping (AudioMapping);
-	int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
-	bool has_rate_above_48k () const;
-	std::vector<std::string> channel_names () const;
+	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 {
@@ -69,7 +79,14 @@ public:
 		return _delay;
 	}
 
-	std::string processing_description (boost::shared_ptr<const Film> film) const;
+	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 {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -81,21 +98,29 @@ public:
 	void set_streams (std::vector<AudioStreamPtr> streams);
 	AudioStreamPtr stream () const;
 
-	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
-	void modify_position (boost::shared_ptr<const Film> film, DCPTime& pos) const;
-	void modify_trim_start (ContentTime& pos) const;
+	void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+	void modify_trim_start (dcpomatic::ContentTime& pos) const;
 
-	static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
+	/** @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;
 
-private:
+	static std::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
 
-	AudioContent (Content* parent, cxml::ConstNodePtr);
+private:
 
 	/** 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;
 };