From 099599250ecd4fbceaeee2041fff10540be7533d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 9 May 2024 21:56:07 +0200 Subject: Remove default DCP content type setting. --- test/create_cli_test.cc | 5 ----- test/data | 2 +- test/test.cc | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'test') diff --git a/test/create_cli_test.cc b/test/create_cli_test.cc index 1be37c253..8ce19d5a2 100644 --- a/test/create_cli_test.cc +++ b/test/create_cli_test.cc @@ -301,10 +301,5 @@ BOOST_AUTO_TEST_CASE(create_cli_defaults_test) auto cc = run("dcpomatic2_create test/data/flat_red.png"); auto film = cc.make_film(); BOOST_CHECK(!film->interop()); - - Config::instance()->set_default_dcp_content_type(DCPContentType::from_isdcf_name("FT")); - cc = run("dcpomatic2_create test/data/flat_red.png"); - film = cc.make_film(); - BOOST_CHECK_EQUAL(film->dcp_content_type()->isdcf_name(), "TST"); } diff --git a/test/data b/test/data index fe54acfc5..d511a06d5 160000 --- a/test/data +++ b/test/data @@ -1 +1 @@ -Subproject commit fe54acfc54d02a8e7b033117644d2dd4ab17d7c9 +Subproject commit d511a06d5124f7d688b5fed8445c53c2fe08e5be diff --git a/test/test.cc b/test/test.cc index 8d92b31e4..c145a8b4d 100644 --- a/test/test.cc +++ b/test/test.cc @@ -120,7 +120,6 @@ setup_test_config () Config::instance()->set_master_encoding_threads (boost::thread::hardware_concurrency() / 2); Config::instance()->set_server_encoding_threads (1); Config::instance()->set_server_port_base (61921); - Config::instance()->set_default_dcp_content_type (static_cast (0)); Config::instance()->set_default_audio_delay (0); Config::instance()->set_default_video_bit_rate(VideoEncoding::JPEG2000, 100000000); Config::instance()->set_default_interop (false); -- cgit v1.2.3