Hand-apply a2f81da6d9afc5d3b5e647e1e05ca5d4507af42c from master;

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

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index fae66bf624aa29b0f363f3153113def9c96e705d..ccd52ea677acda1bbdcd754996c321b43934a2dd 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "scaler.h"
+#include "film.h"
 
 using std::string;
 using std::cout;
@@ -68,7 +69,9 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
        _scaler = Scaler::from_id (node->string_child ("Scaler"));
        _eyes = (Eyes) node->number_child<int> ("Eyes");
        _part = (Part) node->number_child<int> ("Part");
-       _colour_conversion = ColourConversion::from_xml (node);
+
+       /* Assume that the ColourConversion uses the current state version */
+       _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version);
 
        _in = image_proxy_factory (node->node_child ("In"), socket);
 
@@ -91,9 +94,9 @@ PlayerVideo::set_subtitle (PositionImage image)
 }
 
 shared_ptr<Image>
-PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
+PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHandler note) const
 {
-       shared_ptr<Image> im = _in->image ();
+       shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note));
        
        Crop total_crop = _crop;
        switch (_part) {