Fix merging of audio in various circumstances.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index ea2aaf8d40e7e43f9b413315a51d2aeb286214d7..519ff8907478d4459ac2ed1723098a5565d957e5 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -28,7 +28,6 @@
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"
-#include "raw_convert.h"
 #include "user_property.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
@@ -77,6 +76,8 @@ public:
         */
        virtual void examine (boost::shared_ptr<Job> job);
 
+       virtual void use_template (boost::shared_ptr<const Content> c);
+
        /** @return Quick one-line summary of the content, as will be presented in the
         *  film editor.
         */
@@ -87,7 +88,7 @@ public:
         */
        virtual std::string technical_summary () const;
 
-       virtual void as_xml (xmlpp::Node *) const;
+       virtual void as_xml (xmlpp::Node *, bool with_paths) const;
        virtual DCPTime full_length () const = 0;
        virtual std::string identifier () const;
        /** @return points at which to split this content when
@@ -185,7 +186,7 @@ public:
 
 protected:
 
-       virtual void add_properties (std::list<UserProperty> &) const {}
+       virtual void add_properties (std::list<UserProperty> &) const;
 
        boost::weak_ptr<const Film> _film;