Use a struct rather than a std::pair as the return type from ImageProxy::image.

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 8902798a4c4f1d4187d1cc6a6fa095b71ef28de2..8cf44bda1fd870682575f9bc3a6410b59f92bc5b 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -39,6 +39,7 @@ using std::cout;
 using std::list;
 using std::vector;
 using boost::shared_ptr;
+using namespace dcpomatic;
 
 ImageContent::ImageContent (boost::filesystem::path p)
 {
@@ -182,8 +183,8 @@ ImageContent::set_default_colour_conversion ()
 }
 
 void
-ImageContent::add_properties (list<UserProperty>& p) const
+ImageContent::add_properties (shared_ptr<const Film> film, list<UserProperty>& p) const
 {
-       Content::add_properties (p);
+       Content::add_properties (film, p);
        video->add_properties (p);
 }