From 3ff1586aad2fa5ba7e5fd95e178614aae12496e6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 19 Sep 2021 23:57:21 +0200 Subject: [PATCH] Use a constexpr and a nullptr. --- src/lib/film.cc | 4 +++- src/lib/film.h | 2 -- test/film_metadata_test.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/film.cc b/src/lib/film.cc index 7dadd8bea..486c1dd6a 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -111,7 +111,9 @@ using namespace boost::placeholders; using dcp::raw_convert; using namespace dcpomatic; -string const Film::metadata_file = "metadata.xml"; + +static constexpr char metadata_file[] = "metadata.xml"; + /* 5 -> 6 * AudioMapping XML changed. diff --git a/src/lib/film.h b/src/lib/film.h index 85d06f64d..5255e8355 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -495,8 +495,6 @@ private: void check_settings_consistency (); void maybe_set_container_and_resolution (); - static std::string const metadata_file; - /** Log to write to */ std::shared_ptr _log; std::shared_ptr _playlist; diff --git a/test/film_metadata_test.cc b/test/film_metadata_test.cc index 6d4c606e2..f1313497a 100644 --- a/test/film_metadata_test.cc +++ b/test/film_metadata_test.cc @@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE (film_metadata_test) film->_isdcf_date = boost::gregorian::from_undelimited_string ("20130211"); BOOST_CHECK (film->container() == Ratio::from_id ("185")); - BOOST_CHECK (film->dcp_content_type() == 0); + BOOST_CHECK (film->dcp_content_type() == nullptr); film->set_name ("fred"); film->set_dcp_content_type (DCPContentType::from_isdcf_name ("SHR")); -- 2.30.2