Merge master.

[dcpomatic.git] / test / test.cc

diff --git a/test/test.cc b/test/test.cc
index 7c7efd1a090580de332ec217ea4398fb8e20d9cc..d6c7842d711692cc2acd39d296a41916af6cba57 100644 (file)
--- a/test/test.cc
+++ b/test/test.cc
@@ -41,6 +41,8 @@
 #include "ffmpeg_decoder.h"
 #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>
@@ -65,8 +67,10 @@ 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 ();
        }
 };
 
@@ -151,6 +155,8 @@ check_dcp (string ref, string check)
        BOOST_CHECK (ref_dcp.equals (check_dcp, options, boost::bind (note, _1, _2)));
 }
 
+#include "ffmpeg_pts_offset.cc"
+#include "ffmpeg_examiner_test.cc"
 #include "black_fill_test.cc"
 #include "scaling_test.cc"
 #include "ratio_test.cc"
@@ -159,7 +165,7 @@ check_dcp (string ref, string check)
 #include "film_metadata_test.cc"
 #include "stream_test.cc"
 #include "util_test.cc"
-#include "dcp_test.cc"
+#include "ffmpeg_dcp_test.cc"
 #include "frame_rate_test.cc"
 #include "job_test.cc"
 #include "client_server_test.cc"