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 8e6fcd5f3524f8baf4e00c54f791cc92bf4778a7..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,12 +23,14 @@
 #include "image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "scaler.h"
+#include "film.h"
 
 using std::string;
 using std::cout;
 using dcp::raw_convert;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 PlayerVideo::PlayerVideo (
        shared_ptr<const ImageProxy> in,
@@ -40,7 +42,7 @@ PlayerVideo::PlayerVideo (
        Scaler const * scaler,
        Eyes eyes,
        Part part,
-       ColourConversion colour_conversion
+       optional<ColourConversion> colour_conversion
        )
        : _in (in)
        , _time (time)
@@ -56,7 +58,7 @@ PlayerVideo::PlayerVideo (
 
 }
 
-PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket, shared_ptr<Log> log)
+PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket)
 {
        _time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
        _crop = Crop (node);
@@ -67,9 +69,11 @@ 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 (node);
 
-       _in = image_proxy_factory (node->node_child ("In"), socket, log);
+       /* 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);
 
        if (node->optional_number_child<int> ("SubtitleX")) {
                
@@ -141,7 +145,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
        node->add_child("Scaler")->add_child_text (_scaler->id ());
        node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
        node->add_child("Part")->add_child_text (raw_convert<string> (_part));
-       _colour_conversion.as_xml (node);
+       if (_colour_conversion) {
+               _colour_conversion.get().as_xml (node);
+       }
        if (send_subtitles && _subtitle.image) {
                node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle.image->size().width));
                node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle.image->size().height));
@@ -176,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 ();
 }