Merge master.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 4494540a2ac31e5069f1a6c3f192b4c8be837b14..d6c7842d711692cc2acd39d296a41916af6cba57 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -42,6 +42,7 @@
 #include "sndfile_decoder.h"
 #include "dcp_content_type.h"
 #include "ui_signaller.h"
+#include "ratio.h"
 #define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE dcpomatic_test
 #include <boost/test/unit_test.hpp>
@@ -66,8 +67,8 @@ struct TestConfig
                Config::instance()->set_servers (vector<ServerDescription*> ());
                Config::instance()->set_server_port (61920);
                Config::instance()->set_default_dci_metadata (DCIMetadata ());
-               Config::instance()->set_default_container (0);
-               Config::instance()->set_default_dcp_content_type (0);
+               Config::instance()->set_default_container (static_cast<Ratio*> (0));
+               Config::instance()->set_default_dcp_content_type (static_cast<DCPContentType*> (0));
 
                ui_signaller = new UISignaller ();
        }