using std::cout;
using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
using namespace dcpomatic;
Decoder::Decoder (weak_ptr<const Film> film)
- : _film (film)
+ : WeakConstFilm (film)
{
}
which can cause bugs like #1581.
*/
if (!pos) {
- BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+ for (auto i: text) {
if (!i->ignore() && (!pos || i->position(f) < *pos)) {
pos = i->position(f);
}
if (audio) {
audio->seek ();
}
- BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+ for (auto i: text) {
i->seek ();
}
}
}
return text.front ();
}
-
-shared_ptr<const Film>
-Decoder::film () const
-{
- shared_ptr<const Film> f = _film.lock ();
- DCPOMATIC_ASSERT (f);
- return f;
-}