X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=963f759e82fd68e260ab5a7f7f4d16566573cf82;hp=eec67b2010a29fd723e8a9c1fb0848e040e28008;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=e82a4c81fe8bb3c3c6b68c667bda2f32fed4e68d

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index eec67b201..963f759e8 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.
  */
@@ -40,23 +44,27 @@ public:
 	static int const DELAY;
 };
 
+
 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 () 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;
 
-	void set_gain (double);
+	/** Set gain in dB.
+	 *  @param double g New gain in dB.
+	 */
+	void set_gain (double g);
 	void set_delay (int);
 
 	double gain () const {
@@ -69,7 +77,7 @@ public:
 		return _delay;
 	}
 
-	std::string processing_description () const;
+	std::string processing_description (std::shared_ptr<const Film> film) const;
 
 	std::vector<AudioStreamPtr> streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -81,21 +89,19 @@ public:
 	void set_streams (std::vector<AudioStreamPtr> streams);
 	AudioStreamPtr stream () const;
 
-	void add_properties (std::list<UserProperty> &) const;
+	void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
-	void modify_position (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);
+	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;
 	std::vector<AudioStreamPtr> _streams;
 };