Small C++11 tweaks.

[libsub.git] / src / dcp_reader.cc

diff --git a/src/dcp_reader.cc b/src/dcp_reader.cc
index ed48ac8f4b2bbde4df4dcd8cc64051db51d0e804..0c7a29a90aaa9d564f3f18932c00e305599fbd55 100644 (file)
--- a/src/dcp_reader.cc
+++ b/src/dcp_reader.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -23,14 +23,13 @@
 #include <dcp/subtitle_string.h>
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
-#include <boost/foreach.hpp>
 #include <boost/filesystem.hpp>
 
-using std::list;
-using std::cout;
-using std::string;
+using std::dynamic_pointer_cast;
 using std::exception;
-using boost::shared_ptr;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using boost::optional;
 using namespace sub;
 
@@ -53,78 +52,85 @@ DCPReader::DCPReader (boost::filesystem::path file)
        string smpte_error;
 
        try {
-               sc.reset (new dcp::InteropSubtitleAsset (file));
+               sc = make_shared<dcp::InteropSubtitleAsset>(file);
        } catch (exception& e) {
                interop_error = e.what ();
        }
 
        if (!sc) {
                try {
-                       sc.reset (new dcp::SMPTESubtitleAsset (file));
+                       sc = make_shared<dcp::SMPTESubtitleAsset>(file);
                } catch (exception& e) {
                        smpte_error = e.what();
                }
        }
 
        if (!sc) {
-               throw DCPError (String::compose ("Could not read subtitles (%1 / %2)", interop_error, smpte_error));
+               throw DCPError(String::compose("Could not read subtitles (%1 / %2)", interop_error, smpte_error));
        }
 
 
-       BOOST_FOREACH (dcp::SubtitleString const & i, sc->subtitles ()) {
+       for (auto i: sc->subtitles()) {
+
+               /* We don't deal with image subs */
+               auto is = dynamic_pointer_cast<const dcp::SubtitleString>(i);
+               if (!is) {
+                       continue;
+               }
+
                RawSubtitle rs;
-               rs.text = i.text ();
-               rs.font = i.font ();
-               rs.font_size = FontSize::from_proportional (i.size() / (72.0 * 11.0));
+               rs.text = is->text ();
+               rs.font = is->font ();
+               rs.font_size = FontSize::from_proportional (is->size() / (72.0 * 11.0));
 
-               switch (i.effect ()) {
-               case BORDER:
+               switch (is->effect ()) {
+               case dcp::Effect::BORDER:
                        rs.effect = BORDER;
                        break;
-               case SHADOW:
+               case dcp::Effect::SHADOW:
                        rs.effect = SHADOW;
                        break;
                default:
                        break;
                }
 
-               rs.effect_colour = dcp_to_sub_colour (i.effect_colour());
+               rs.effect_colour = dcp_to_sub_colour (is->effect_colour());
 
-               rs.colour = dcp_to_sub_colour (i.colour());
-               rs.bold = i.bold ();
-               rs.italic = i.italic ();
-               rs.underline = i.underline ();
+               rs.colour = dcp_to_sub_colour (is->colour());
+               rs.bold = is->bold ();
+               rs.italic = is->italic ();
+               rs.underline = is->underline ();
 
-               switch (i.h_align()) {
-               case dcp::HALIGN_LEFT:
-                       rs.horizontal_position = LEFT;
+               switch (is->h_align()) {
+               case dcp::HAlign::LEFT:
+                       rs.horizontal_position.reference = LEFT_OF_SCREEN;
                        break;
-               case dcp::HALIGN_CENTER:
-                       rs.horizontal_position = CENTRE;
+               case dcp::HAlign::CENTER:
+                       rs.horizontal_position.reference = HORIZONTAL_CENTRE_OF_SCREEN;
                        break;
-               case dcp::HALIGN_RIGHT:
-                       rs.horizontal_position = RIGHT;
+               case dcp::HAlign::RIGHT:
+                       rs.horizontal_position.reference = RIGHT_OF_SCREEN;
                        break;
                }
 
-               rs.vertical_position.proportional = i.v_position();
-               switch (i.v_align()) {
-               case dcp::VALIGN_TOP:
+               rs.vertical_position.proportional = is->v_position();
+               switch (is->v_align()) {
+               case dcp::VAlign::TOP:
                        rs.vertical_position.reference = TOP_OF_SCREEN;
                        break;
-               case dcp::VALIGN_CENTER:
-                       rs.vertical_position.reference = CENTRE_OF_SCREEN;
+               case dcp::VAlign::CENTER:
+                       rs.vertical_position.reference = VERTICAL_CENTRE_OF_SCREEN;
                        break;
-               case dcp::VALIGN_BOTTOM:
+               case dcp::VAlign::BOTTOM:
                        rs.vertical_position.reference = BOTTOM_OF_SCREEN;
                        break;
                }
 
-               rs.from = dcp_to_sub_time (i.in ());
-               rs.to = dcp_to_sub_time (i.out ());
+               rs.from = dcp_to_sub_time (is->in ());
+               rs.to = dcp_to_sub_time (is->out ());
 
-               rs.fade_up = dcp_to_sub_time (i.fade_up_time ());
-               rs.fade_down = dcp_to_sub_time (i.fade_down_time ());
+               rs.fade_up = dcp_to_sub_time (is->fade_up_time ());
+               rs.fade_down = dcp_to_sub_time (is->fade_down_time ());
 
                _subs.push_back (rs);
        }