Add appearance dialog for SubRip subtitles.

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 694b2215725b2a17070256f2f28a3d3b404f905f..0bb54333751007ad8fd1cd9c89e26aed4bde049e 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -20,6 +20,7 @@
 #include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
 #include "subrip_content.h"
+#include <iostream>
 
 using std::list;
 using std::vector;
@@ -27,6 +28,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 
 SubRipDecoder::SubRipDecoder (shared_ptr<const SubRipContent> content)
        : SubtitleDecoder (content)
@@ -40,7 +42,7 @@ void
 SubRipDecoder::seek (ContentTime time, bool accurate)
 {
        SubtitleDecoder::seek (time, accurate);
-       
+
        _next = 0;
        while (_next < _subtitles.size() && ContentTime::from_seconds (_subtitles[_next].from.all_as_seconds ()) < time) {
                ++_next;
@@ -48,14 +50,17 @@ SubRipDecoder::seek (ContentTime time, bool accurate)
 }
 
 bool
-SubRipDecoder::pass ()
+SubRipDecoder::pass (PassReason, bool)
 {
        if (_next >= _subtitles.size ()) {
                return true;
        }
 
        /* XXX: we are ignoring positioning specified in the file */
-       
+
+       shared_ptr<const SubRipContent> content = dynamic_pointer_cast<const SubRipContent> (_subtitle_content);
+       DCPOMATIC_ASSERT (content);
+
        list<dcp::SubtitleString> out;
        for (list<sub::Line>::const_iterator i = _subtitles[_next].lines.begin(); i != _subtitles[_next].lines.end(); ++i) {
                for (list<sub::Block>::const_iterator j = i->blocks.begin(); j != i->blocks.end(); ++j) {
@@ -63,41 +68,47 @@ SubRipDecoder::pass ()
                                dcp::SubtitleString (
                                        SubRipContent::font_id,
                                        j->italic,
-                                       dcp::Colour (255, 255, 255),
+                                       /* force the colour to whatever is configured */
+                                       content->colour(),
                                        j->font_size.points (72 * 11),
-                                       dcp::Time (rint (_subtitles[_next].from.all_as_seconds())),
-                                       dcp::Time (rint (_subtitles[_next].to.all_as_seconds())),
+                                       1.0,
+                                       dcp::Time (_subtitles[_next].from.all_as_seconds(), 1000),
+                                       dcp::Time (_subtitles[_next].to.all_as_seconds(), 1000),
+                                       0,
+                                       dcp::HALIGN_CENTER,
                                        i->vertical_position.line.get() * (1.5 / 22) + 0.8,
-                                       dcp::TOP,
+                                       dcp::VALIGN_TOP,
                                        j->text,
-                                       dcp::NONE,
-                                       dcp::Colour (255, 255, 255),
-                                       0,
-                                       0
+                                       content->outline() ? dcp::BORDER : dcp::NONE,
+                                       content->outline_colour(),
+                                       dcp::Time (0, 1000),
+                                       dcp::Time (0, 1000)
                                        )
                                );
                }
        }
 
-       text_subtitle (out);
+       text_subtitle (content_time_period (_subtitles[_next]), out);
+
        ++_next;
        return false;
 }
 
 list<ContentTimePeriod>
-SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+SubRipDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+       return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+SubRipDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
 {
        /* XXX: inefficient */
 
        list<ContentTimePeriod> d;
 
        for (vector<sub::Subtitle>::const_iterator i = _subtitles.begin(); i != _subtitles.end(); ++i) {
-
-               ContentTimePeriod t (
-                       ContentTime::from_seconds (i->from.all_as_seconds()),
-                       ContentTime::from_seconds (i->to.all_as_seconds())
-                       );
-
+               ContentTimePeriod t = content_time_period (*i);
                if ((starting && p.contains (t.from)) || (!starting && p.overlaps (t))) {
                        d.push_back (t);
                }
@@ -105,3 +116,12 @@ SubRipDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
 
        return d;
 }
+
+ContentTimePeriod
+SubRipDecoder::content_time_period (sub::Subtitle s) const
+{
+       return ContentTimePeriod (
+               ContentTime::from_seconds (s.from.all_as_seconds()),
+               ContentTime::from_seconds (s.to.all_as_seconds())
+               );
+}