From e159aafa457003982101cb6c03674d5e2ed2c0ab Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 8 Dec 2014 13:21:21 +0000 Subject: Hand-apply 63142d58947cf10ed6f6eaeb42508eaa374a6a93 from master; fix calls to new digest() call. --- src/lib/content.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/content.cc b/src/lib/content.cc index 91faff116..cc29345a2 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -218,7 +218,7 @@ Content::clone () const string Content::technical_summary () const { - return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds()); + return String::compose ("%1 %2 %3", path_summary(), digest().get_value_or("X"), position().seconds()); } DCPTime @@ -235,7 +235,7 @@ Content::identifier () const { SafeStringStream s; - s << Content::digest() + s << Content::digest().get_value_or("X") << "_" << position().get() << "_" << trim_start().get() << "_" << trim_end().get(); -- cgit v1.2.3