X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=98e16a45773f3c0ca0debad384f0c2d6b9e0ef20;hp=92491bf89414745648a3658b6a022fe01fd06139;hb=a5be11a965c2c38442e4e069874e7e21b5b43a5c;hpb=ca436a8e96e02f982790d4168ac3dfe1d589451c

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 92491bf89..98e16a457 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -43,16 +43,16 @@ public:
 class AudioContent : public ContentPart
 {
 public:
-	AudioContent (Content* parent);
+	explicit AudioContent (Content* parent);
 	AudioContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
+	void take_settings_from (boost::shared_ptr<const AudioContent> c);
 
 	AudioMapping mapping () const;
 	void set_mapping (AudioMapping);
-	int resampled_frame_rate () const;
-	bool has_rate_above_48k () const;
+	int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
 	std::vector<std::string> channel_names () const;
 
 	void set_gain (double);
@@ -68,7 +68,7 @@ public:
 		return _delay;
 	}
 
-	std::string processing_description () const;
+	std::string processing_description (boost::shared_ptr<const Film> film) const;
 
 	std::vector<AudioStreamPtr> streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -80,7 +80,10 @@ public:
 	void set_streams (std::vector<AudioStreamPtr> streams);
 	AudioStreamPtr stream () const;
 
-	void add_properties (std::list<UserProperty> &) const;
+	void add_properties (boost::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;
 
 	static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);