diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-09 20:35:39 +0100 |
| commit | 89115db77729a2c99f1a09ff6a461720e16f889e (patch) | |
| tree | e528ec014b820d4e0efa28893dcee91cd76ee618 /test/test.cc | |
| parent | f8ad440cf187c517b7800f3efdfc0954025c4422 (diff) | |
| parent | d2ff6a6b0256e256b6df416f280c846072f7682f (diff) | |
Merge master.
Diffstat (limited to 'test/test.cc')
| -rw-r--r-- | test/test.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/test.cc b/test/test.cc index 4494540a2..d6c7842d7 100644 --- 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 (); } |