Hand-apply 63142d58947cf10ed6f6eaeb42508eaa374a6a93 from master; fix calls to new...

diff --git a/TO_PORT b/TO_PORT
index fc1e9ecdade7a49caed5019665a2504f625353ab..aff074f5b2ed54bc990f50a89eb988c9955a932f 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,4 +1,3 @@
-20f9378678456f4c64f5d887e317a762faee6bde
 4af669f559e1afd5375c8e96ee65f651aea0ec9f
 22ff18bc9fb57419cbc81da553effd59638b488f
 0d4ab6d2536a037a1c6699a4672adfb42294320e

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 91faff116e65dcb8f62155a7b9f7be4bc035a387..cc29345a298f9b15d25444f439e3d2580dca8efa 100644 (file)
--- 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();