Build fixes for Boost >= 1.73

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

diff --git a/src/lib/hints.cc b/src/lib/hints.cc
index 0f18835ef47887a8171eba059ae2b5e8032a1877..34a7a8392f513299adf450b385f7b4b4fafa65fc 100644 (file)
--- a/src/lib/hints.cc
+++ b/src/lib/hints.cc
@@ -50,6 +50,9 @@ using boost::weak_ptr;
 using boost::optional;
 using boost::bind;
 using namespace dcpomatic;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 
 Hints::Hints (weak_ptr<const Film> film)
        : _film (film)
@@ -69,17 +72,13 @@ Hints::start ()
 
 Hints::~Hints ()
 {
-       if (!_thread.joinable()) {
-               return;
-       }
+       boost::this_thread::disable_interruption dis;
 
        try {
                _stop = true;
                _thread.interrupt ();
                _thread.join ();
-       } catch (...) {
-
-       }
+       } catch (...) {}
 }
 
 void
@@ -126,7 +125,7 @@ Hints::thread ()
                        Ratio const * r = Ratio::nearest_from_ratio(i->video->scaled_size(film->frame_size()).ratio());
                        if (r && r->id() == "239") {
                                ++scope;
-                       } else if (r && r->id() != "239" && r->id() != "190") {
+                       } else if (r && r->id() != "239" && r->id() != "235" && r->id() != "190") {
                                ++narrower_than_scope;
                        }
                }
@@ -139,7 +138,7 @@ Hints::thread ()
        }
 
        if (!scope && narrower_than_scope && film_container == "239") {
-               hint (_("All of your content is 2.35:1 or narrower but your DCP's container is Scope (2.39:1).  This will pillar-box your content.  You may prefer to set your DCP's container to have the same ratio as your content."));
+               hint (_("All of your content narrower than 1.90:1 but your DCP's container is Scope (2.39:1).  This will pillar-box your content.  You may prefer to set your DCP's container to have the same ratio as your content."));
        }
 
        if (film_container != "185" && film_container != "239" && film_container != "190") {