From 16cf80a019cc9df15580e0fb21b5d340a58c0b94 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 18 Dec 2025 16:11:53 +0100 Subject: Add set_isdcf_date() allowing removal of some friends. --- src/lib/film.cc | 7 +++++++ src/lib/film.h | 12 +----------- test/film_metadata_test.cc | 2 +- test/isdcf_name_test.cc | 10 +++++----- test/vf_test.cc | 2 +- 5 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/lib/film.cc b/src/lib/film.cc index 56d7b47a6..0e9c096fc 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -1383,6 +1383,13 @@ Film::set_isdcf_date_today() } +void +Film::set_isdcf_date(boost::gregorian::date date) +{ + _isdcf_date = std::move(date); +} + + boost::filesystem::path Film::j2c_path(int reel, Frame frame, Eyes eyes, bool tmp) const { diff --git a/src/lib/film.h b/src/lib/film.h index 258be7f31..1bb60f9d5 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -78,11 +78,6 @@ class Job; class Log; class Playlist; struct atmos_encrypted_passthrough_test; -struct isdcf_name_test; -struct isdcf_name_with_atmos; -struct isdcf_name_with_ccap; -struct isdcf_name_with_closed_subtitles; -struct ov_subs_in_vf_name; struct recover_test_2d_encrypted; @@ -413,6 +408,7 @@ public: void set_audio_channels(int); void set_three_d(bool); void set_isdcf_date_today(); + void set_isdcf_date(boost::gregorian::date); void set_sequence(bool); void set_interop(bool); void set_video_encoding(VideoEncoding encoding); @@ -481,12 +477,6 @@ public: private: friend struct ::atmos_encrypted_passthrough_test; - friend struct film_metadata_test; - friend struct ::isdcf_name_test; - friend struct ::isdcf_name_with_atmos; - friend struct ::isdcf_name_with_ccap; - friend struct ::isdcf_name_with_closed_subtitles; - friend struct ::ov_subs_in_vf_name; friend struct paths_test; friend struct ::recover_test_2d_encrypted; template friend class ChangeSignalDespatcher; diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 2592938a7..d5fdb4cc5 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) auto film = new_test_film("film_metadata_test"); auto dir = test_film_dir ("film_metadata_test"); - film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211"); + film->set_isdcf_date(boost::gregorian::from_undelimited_string("20130211")); BOOST_CHECK (film->container() == Ratio::from_id ("185")); BOOST_CHECK (film->dcp_content_type() == DCPContentType::from_isdcf_name("TST")); diff --git a/test/isdcf_name_test.cc b/test/isdcf_name_test.cc index 71dd0c108..f03ece4e7 100644 --- a/test/isdcf_name_test.cc +++ b/test/isdcf_name_test.cc @@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_name ("My Nice Film"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); - film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4); + film->set_isdcf_date(boost::gregorian::date(2014, boost::gregorian::Jul, 4)); film->set_audio_language(dcp::LanguageTag("en-US")); film->set_content_versions({"1"}); film->set_release_territory(dcp::LanguageTag::RegionSubtag("GB")); @@ -73,7 +73,7 @@ BOOST_AUTO_TEST_CASE (isdcf_name_test) film->set_name ("My Nice Film With A Very Long Name"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("TLR")); film->set_container (Ratio::from_id ("239")); - film->_isdcf_date = boost::gregorian::date (2014, boost::gregorian::Jul, 4); + film->set_isdcf_date(boost::gregorian::date(2014, boost::gregorian::Jul, 4)); film->set_audio_channels (1); film->set_resolution (Resolution::FOUR_K); auto text = content_factory("test/data/subrip.srt")[0]; @@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE(isdcf_name_with_atmos) { auto content = content_factory(TestPaths::private_data() / "atmos_asset.mxf"); auto film = new_test_film("isdcf_name_with_atmos", content); - film->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18); + film->set_isdcf_date(boost::gregorian::date(2023, boost::gregorian::Jan, 18)); film->set_name("Hello"); BOOST_CHECK_EQUAL(film->isdcf_name(false), "Hello_TST-1_F_XX-XX_MOS-IAB_2K_20230118_SMPTE_OV"); @@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE(isdcf_name_with_ccap) content->text[0]->set_use(true); content->text[0]->set_type(TextType::CLOSED_CAPTION); content->text[0]->set_dcp_track(DCPTextTrack("Foo", dcp::LanguageTag("de-DE"))); - film->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18); + film->set_isdcf_date(boost::gregorian::date(2023, boost::gregorian::Jan, 18)); film->set_name("Hello"); BOOST_CHECK_EQUAL(film->isdcf_name(false), "Hello_TST-1_F_XX-DE-CCAP_MOS_2K_20230118_SMPTE_OV"); @@ -286,7 +286,7 @@ BOOST_AUTO_TEST_CASE(isdcf_name_with_closed_subtitles) content->text[0]->set_use(true); content->text[0]->set_type(TextType::CLOSED_SUBTITLE); content->text[0]->set_dcp_track(DCPTextTrack("Foo", dcp::LanguageTag("de-DE"))); - film->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18); + film->set_isdcf_date(boost::gregorian::date(2023, boost::gregorian::Jan, 18)); film->set_name("Hello"); BOOST_CHECK_EQUAL(film->isdcf_name(false), "Hello_TST-1_F_XX-DE_MOS_2K_20230118_SMPTE_OV"); diff --git a/test/vf_test.cc b/test/vf_test.cc index 4415b79a5..b362e59b8 100644 --- a/test/vf_test.cc +++ b/test/vf_test.cc @@ -537,7 +537,7 @@ BOOST_AUTO_TEST_CASE(ov_subs_in_vf_name) vf->set_name("foo"); vf->set_audio_channels(8); ov_dcp->set_reference_text(TextType::OPEN_SUBTITLE, true); - vf->_isdcf_date = boost::gregorian::date(2023, boost::gregorian::Jan, 18); + vf->set_isdcf_date(boost::gregorian::date(2023, boost::gregorian::Jan, 18)); BOOST_CHECK_EQUAL(vf->isdcf_name(false), "Foo_TST-1_F_XX-DE_51-HI-VI_2K_20230118_SMPTE_VF"); } -- cgit v1.2.3