diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-09 22:20:53 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-29 10:35:55 +0200 |
| commit | 0e1a20f2717c9e14d2b6675260e2229dfb145ffe (patch) | |
| tree | 545a6d91e6d120be8f3882577b87c183aff43298 /test | |
| parent | 2d82f86d2f99b812edd5d64d13f3dd5a4950719e (diff) | |
Remove default Interop/SMPTE setting.
Diffstat (limited to 'test')
| -rw-r--r-- | test/client_server_test.cc | 2 | ||||
| -rw-r--r-- | test/create_cli_test.cc | 17 | ||||
| m--------- | test/data | 0 | ||||
| -rw-r--r-- | test/test.cc | 1 |
4 files changed, 2 insertions, 18 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 9840a07a1..43084bf31 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -33,6 +33,7 @@ #include "lib/encode_server_description.h" #include "lib/encode_server_finder.h" #include "lib/file_log.h" +#include "lib/film.h" #include "lib/image.h" #include "lib/j2k_image_proxy.h" #include "lib/player_video.h" @@ -322,6 +323,7 @@ BOOST_AUTO_TEST_CASE(real_encode_with_server) auto content = content_factory(TestPaths::private_data() / "dolby_aurora.vob"); auto film = new_test_film("real_encode_with_server", content, &cl); + film->set_interop(false); EncodeServerFinder::instance(); diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc index 8ce19d5a2..7006fa6a0 100644 --- a/test/create_cli_test.cc +++ b/test/create_cli_test.cc @@ -286,20 +286,3 @@ BOOST_AUTO_TEST_CASE(create_cli_template_test) film = cc.make_film(); BOOST_CHECK(film->interop()); } - - -BOOST_AUTO_TEST_CASE(create_cli_defaults_test) -{ - ConfigRestorer cr; - - /* I think on balance dcpomatic2_create should not use the defaults from Config; - * it seems a bit surprising that settings from a GUI tool can change the behaviour of - * a CLI tool, and at some point we're probably going to remove all the default config - * options from the main DoM anyway (in favour of a default template). - */ - Config::instance()->set_default_interop(true); - auto cc = run("dcpomatic2_create test/data/flat_red.png"); - auto film = cc.make_film(); - BOOST_CHECK(!film->interop()); -} - diff --git a/test/data b/test/data -Subproject 04dde6faddc797652ead4f75d27dfdd48db77dd +Subproject f647e9364406f7934acd4c248c77287a810f59c diff --git a/test/test.cc b/test/test.cc index 8efbf3225..abadb72fc 100644 --- a/test/test.cc +++ b/test/test.cc @@ -121,7 +121,6 @@ setup_test_config () Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); Config::instance()->set_default_audio_delay (0); - Config::instance()->set_default_interop (false); Config::instance()->set_default_still_length (10); Config::instance()->set_log_types ( LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | |