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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 1a2c2911d..051fc8db8 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 use_template (boost::shared_ptr<const AudioContent> c);
+	void take_settings_from (boost::shared_ptr<const AudioContent> c);
 
 	AudioMapping mapping () const;
 	void set_mapping (AudioMapping);
-	int resampled_frame_rate () const;
+	int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
 	bool has_rate_above_48k () const;
 	std::vector<std::string> channel_names () const;
 
@@ -69,7 +69,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);
@@ -81,7 +81,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);