Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 31454c5a7c7c1a8d8a2b18973f09d2abc1c61755..28beeaed1920769eac45801a64f11ffd7cbf1074 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -39,7 +39,6 @@
 #include "playlist.h"
 
 class DCPContentType;
-class Container;
 class Job;
 class Filter;
 class Log;
@@ -169,7 +168,7 @@ public:
                return _dcp_content_type;
        }
 
-       Container const * container () const {
+       Ratio const * container () const {
                boost::mutex::scoped_lock lm (_state_mutex);
                return _container;
        }
@@ -234,7 +233,7 @@ public:
        void add_content (boost::shared_ptr<Content>);
        void remove_content (boost::shared_ptr<Content>);
        void set_dcp_content_type (DCPContentType const *);
-       void set_container (Container const *);
+       void set_container (Ratio const *);
        void set_scaler (Scaler const *);
        void set_ab (bool);
        void set_with_subtitles (bool);
@@ -286,7 +285,7 @@ private:
        /** The type of content that this Film represents (feature, trailer etc.) */
        DCPContentType const * _dcp_content_type;
        /** The container to put this Film in (flat, scope, etc.) */
-       Container const * _container;
+       Ratio const * _container;
        /** Scaler algorithm to use */
        Scaler const * _scaler;
        /** true to create an A/B comparison DCP, where the left half of the image