Build fixes for Boost >= 1.73

[dcpomatic.git] / src / lib / butler.cc

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index fe331fc79dca1609f9ba5ddacd23a20595bf0f94..3e557cffa1b8a1f9e5e82cddb0d811279cbc2c90 100644 (file)
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -38,6 +38,9 @@ using boost::shared_ptr;
 using boost::bind;
 using boost::optional;
 using boost::function;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 /** Minimum video readahead in frames */
 #define MINIMUM_VIDEO_READAHEAD 10
@@ -234,7 +237,7 @@ Butler::get_video (Error* e)
 
        if (_video.empty()) {
                if (e) {
-                       *e = NONE;
+                       *e = _died ? DIED : NONE;
                }
                return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
        }