Trying to create export audio encoders with between 9 and 15 channels

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 47f29cb79e3f7626875e7546c628dfef1a375602..4c1d55765b6d07484e57455926ab6885b661580c 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -91,11 +91,12 @@ public:
 
        virtual void as_xml (xmlpp::Node *, bool with_paths) const;
        virtual DCPTime full_length (boost::shared_ptr<const Film>) const = 0;
+       virtual DCPTime approximate_length () const = 0;
        virtual std::string identifier () const;
        /** @return points at which to split this content when
         *  REELTYPE_BY_VIDEO_CONTENT is in use.
         */
-       virtual std::list<DCPTime> reel_split_points () const;
+       virtual std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film>) const;
 
        boost::shared_ptr<Content> clone () const;
 
@@ -134,7 +135,7 @@ public:
                return _digest;
        }
 
-       void set_position (boost::shared_ptr<const Film> film, DCPTime);
+       void set_position (boost::shared_ptr<const Film> film, DCPTime, bool force_emit = false);
 
        /** DCPTime that this content starts; i.e. the time that the first
         *  bit of the content (trimmed or not) will happen.
@@ -179,11 +180,11 @@ public:
                _change_signals_frequent = f;
        }
 
-       std::list<UserProperty> user_properties () const;
+       std::list<UserProperty> user_properties (boost::shared_ptr<const Film> film) const;
 
        std::string calculate_digest () const;
 
-       /* CHANGE_PENDING and CHANGE_CANCELLED may be emitted from any thread; CHANGE_DONE always from GUI thread */
+       /* CHANGE_TYPE_PENDING and CHANGE_TYPE_CANCELLED may be emitted from any thread; CHANGE_TYPE_DONE always from GUI thread */
        boost::signals2::signal<void (ChangeType, boost::weak_ptr<Content>, int, bool)> Change;
 
        boost::shared_ptr<VideoContent> video;
@@ -195,7 +196,7 @@ public:
 
 protected:
 
-       virtual void add_properties (std::list<UserProperty> &) const;
+       virtual void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
 
        /** _mutex which should be used to protect accesses, as examine
         *  jobs can update content state in threads other than the main one.