Fix loading of 1.x metadata.

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

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index b7a8f86693c995606cf47a07791192c5bcb1d92e..94e6f3f2acd87afc357a06a99fcad7de357a4f11 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);
 
@@ -179,7 +182,7 @@ shared_ptr<EncodedData>
 PlayerVideo::j2k () const
 {
        shared_ptr<const J2KImageProxy> j2k = dynamic_pointer_cast<const J2KImageProxy> (_in);
-       assert (j2k);
+       DCPOMATIC_ASSERT (j2k);
        return j2k->j2k ();
 }