FIXME: Remove all use of add_child() from xmlpp.

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

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 82a9de04171ef85a6719f6e229c0451ab7088657..2a140b3e4f772bef453dde1d0899b0237d55159d 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -28,9 +28,10 @@
 #define DCPOMATIC_AUDIO_CONTENT_H
 
 
-#include "content_part.h"
-#include "audio_stream.h"
 #include "audio_mapping.h"
+#include "audio_stream.h"
+#include "content_part.h"
+#include "named_channel.h"
 
 
 /** @class AudioContentProperty
@@ -55,7 +56,7 @@ public:
        AudioContent (Content* parent, std::vector<std::shared_ptr<Content>>);
        AudioContent (Content* parent, cxml::ConstNodePtr);
 
-       void as_xml (xmlpp::Node *) const;
+       void as_xml(xmlpp::Element*) const;
        std::string technical_summary () const;
        void take_settings_from (std::shared_ptr<const AudioContent> c);
 
@@ -95,13 +96,12 @@ public:
 
        void add_stream (AudioStreamPtr stream);
        void set_stream (AudioStreamPtr stream);
-       void set_streams (std::vector<AudioStreamPtr> streams);
        AudioStreamPtr stream () const;
 
        void add_properties (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
        void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
-       void modify_trim_start (dcpomatic::ContentTime& pos) const;
+       void modify_trim_start(std::shared_ptr<const Film> film, dcpomatic::ContentTime& pos) const;
 
        /** @param frame frame within the whole (untrimmed) content.
         *  @param frame_rate The frame rate of the audio (it may have been resampled).