Try to fix no-stretch / no-scale for non-square pixels (#1636).

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

diff --git a/src/lib/dcp_content.h b/src/lib/dcp_content.h
index 874e1ee318f447914e4a6fdbb464b27dccbe6eed..65bed29bc91bd55b7ab16ce4ad3937ee151527bc 100644 (file)
--- a/src/lib/dcp_content.h
+++ b/src/lib/dcp_content.h
@@ -61,7 +61,8 @@ public:
                return boost::dynamic_pointer_cast<const DCPContent> (Content::shared_from_this ());
        }
 
-       DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime full_length (boost::shared_ptr<const Film> film) const;
+       dcpomatic::DCPTime approximate_length () const;
 
        void examine (boost::shared_ptr<const Film> film, boost::shared_ptr<Job>);
        std::string summary () const;
@@ -71,7 +72,7 @@ public:
        void take_settings_from (boost::shared_ptr<const Content> c);
 
        void set_default_colour_conversion ();
-       std::list<DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
+       std::list<dcpomatic::DCPTime> reel_split_points (boost::shared_ptr<const Film> film) const;
 
        std::vector<boost::filesystem::path> directories () const;
 
@@ -151,7 +152,8 @@ private:
        void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty>& p) const;
 
        void read_directory (boost::filesystem::path);
-       std::list<DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
+       void read_sub_directory (boost::filesystem::path);
+       std::list<dcpomatic::DCPTimePeriod> reels (boost::shared_ptr<const Film> film) const;
        bool can_reference (
                boost::shared_ptr<const Film> film,
                boost::function <bool (boost::shared_ptr<const Content>)>,