Remove FFmpeg::_packet.

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

diff --git a/src/lib/dcp_subtitle_decoder.cc b/src/lib/dcp_subtitle_decoder.cc
index 16a738a5135eedc5407e55f6185554faefc14d1a..1b144f20456bec9e3d928851632f70b958e85314 100644 (file)
--- a/src/lib/dcp_subtitle_decoder.cc
+++ b/src/lib/dcp_subtitle_decoder.cc
@@ -29,8 +29,8 @@ using std::list;
 using std::map;
 using std::string;
 using std::vector;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
 using boost::bind;
 using namespace dcpomatic;
 
@@ -54,7 +54,7 @@ DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const Film> film, shared_ptr<
        }
 
        /* Add a default font for any LoadFont nodes in our file which we haven't yet found fonts for */
-       BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, c->load_font_nodes()) {
+       for (auto i: c->load_font_nodes()) {
                if (fm.find(i->id) == fm.end()) {
                        _fonts.push_back (FontData(i->id, dcp::ArrayData(default_font_file())));
                }
@@ -67,7 +67,7 @@ DCPSubtitleDecoder::seek (ContentTime time, bool accurate)
        Decoder::seek (time, accurate);
 
        _next = _subtitles.begin ();
-       list<shared_ptr<dcp::Subtitle> >::const_iterator i = _subtitles.begin ();
+       auto i = _subtitles.begin ();
        while (i != _subtitles.end() && ContentTime::from_seconds ((*_next)->in().as_seconds()) < time) {
                ++i;
        }
@@ -92,7 +92,7 @@ DCPSubtitleDecoder::pass ()
        ContentTimePeriod const p = content_time_period (*_next);
 
        while (_next != _subtitles.end () && content_time_period (*_next) == p) {
-               shared_ptr<dcp::SubtitleString> ns = dynamic_pointer_cast<dcp::SubtitleString>(*_next);
+               auto ns = dynamic_pointer_cast<const dcp::SubtitleString>(*_next);
                if (ns) {
                        s.push_back (*ns);
                        ++_next;
@@ -101,7 +101,7 @@ DCPSubtitleDecoder::pass ()
                           this would need to be done both here and in DCPDecoder.
                        */
 
-                       shared_ptr<dcp::SubtitleImage> ni = dynamic_pointer_cast<dcp::SubtitleImage>(*_next);
+                       auto ni = dynamic_pointer_cast<const dcp::SubtitleImage>(*_next);
                        if (ni) {
                                emit_subtitle_image (p, *ni, film()->frame_size(), only_text());
                                ++_next;
@@ -114,12 +114,12 @@ DCPSubtitleDecoder::pass ()
 }
 
 ContentTimePeriod
-DCPSubtitleDecoder::content_time_period (shared_ptr<dcp::Subtitle> s) const
+DCPSubtitleDecoder::content_time_period (shared_ptr<const dcp::Subtitle> s) const
 {
-       return ContentTimePeriod (
-               ContentTime::from_seconds (s->in().as_seconds ()),
-               ContentTime::from_seconds (s->out().as_seconds ())
-               );
+       return {
+               ContentTime::from_seconds(s->in().as_seconds()),
+               ContentTime::from_seconds(s->out().as_seconds())
+       };
 }