Take Film pointer out of Content.

[dcpomatic.git] / src / lib / audio_content.h

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index da00bfeb1eff35765751b2d09434a76f3d733d9e..051fc8db8941f137fdd54d90f457dd709204aa42 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -43,15 +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;
+       int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
        bool has_rate_above_48k () const;
        std::vector<std::string> channel_names () const;
 
@@ -68,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);
@@ -80,9 +81,12 @@ 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;
 
-       static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr);
+       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);
 
 private: