summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-04-06 21:16:29 +0100
committerCarl Hetherington <cth@carlh.net>2019-04-08 00:22:40 +0100
commitb1389f1604a90d2f71da139534bf39ee17b31d64 (patch)
treeea2d343c1f9b72e7f0c6644383f60328339af93d /src
parenta71d23fd64ecebf8469b3d26d16528e04b2edf7a (diff)
Fix mis-merge.
Diffstat (limited to 'src')
-rw-r--r--src/lib/film.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 6df037316..77e566124 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -553,8 +553,6 @@ Film::read_metadata (optional<boost::filesystem::path> path)
_ratings.push_back (dcp::Rating(i));
}
- list<string> notes;
- /* This method is the only one that can return notes (so far) */
_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
/* Write backtraces to this film's directory, until another film is loaded */