Merge master.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index e5840621a1f7475ad1040cbe61fe932858ce7648..162b67b351bd6b9d0e2a97a6dc60e5b1e49387e1 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -83,7 +83,7 @@ public:
        boost::filesystem::path file (boost::filesystem::path f) const;
        boost::filesystem::path dir (boost::filesystem::path d) const;
 
-       void read_metadata ();
+       std::list<std::string> read_metadata ();
        void write_metadata () const;
        boost::shared_ptr<xmlpp::Document> metadata () const;
 
@@ -96,6 +96,7 @@ public:
        }
 
        libdcp::Size full_frame () const;
+       libdcp::Size frame_size () const;
 
        std::list<boost::filesystem::path> dcps () const;