Merge master.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 26b3962a1fe7c122fd7c03b2f5057afc2725168f..75ec700e0092e5bb35487f43556e4c93b1600b4e 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -32,7 +32,6 @@
 #include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include "film.h"
-#include "container.h"
 #include "job.h"
 #include "filter.h"
 #include "util.h"
@@ -54,6 +53,8 @@
 #include "imagemagick_content.h"
 #include "sndfile_content.h"
 #include "dcp_content_type.h"
+#include "ratio.h"
+#include "cross.h"
 
 #include "i18n.h"
 
@@ -426,7 +427,7 @@ Film::read_metadata ()
        {
                optional<string> c = f.optional_string_child ("Container");
                if (c) {
-                       _container = Container::from_id (c.get ());
+                       _container = Ratio::from_id (c.get ());
                }
        }
 
@@ -602,7 +603,7 @@ Film::set_dcp_content_type (DCPContentType const * t)
 }
 
 void
-Film::set_container (Container const * c)
+Film::set_container (Ratio const * c)
 {
        {
                boost::mutex::scoped_lock lm (_state_mutex);
@@ -905,3 +906,15 @@ Film::dcp_audio_frame_rate () const
        /* XXX */
        return 48000;
 }
+
+void
+Film::set_sequence_video (bool s)
+{
+       _playlist->set_sequence_video (s);
+}
+
+libdcp::Size
+Film::full_frame () const
+{
+       return libdcp::Size (2048, 1080);
+}