summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-09-19 23:57:21 +0200
committerCarl Hetherington <cth@carlh.net>2021-09-20 00:08:17 +0200
commit3ff1586aad2fa5ba7e5fd95e178614aae12496e6 (patch)
treea190a45f919120c272cd97a734f30479e62b3372 /src/lib
parent2b3fbc42400258ae47ae3a10d3dfd9f0561d1940 (diff)
Use a constexpr and a nullptr.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/film.cc4
-rw-r--r--src/lib/film.h2
2 files changed, 3 insertions, 3 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> _log;
std::shared_ptr<Playlist> _playlist;