More renaming.

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

diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc
index 2ffe110655d8f676217f6ee6af38d0fab0b95d5a..6a9de841d51f078bc41c6962b0230a473ce42876 100644 (file)
--- a/src/lib/dcp_decoder.cc
+++ b/src/lib/dcp_decoder.cc
@@ -24,7 +24,7 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "j2k_image_proxy.h"
-#include "subtitle_decoder.h"
+#include "text_decoder.h"
 #include "image.h"
 #include "config.h"
 #include <dcp/dcp.h>
@@ -44,6 +44,8 @@
 #include <boost/foreach.hpp>
 #include <iostream>
 
+#include "i18n.h"
+
 using std::list;
 using std::cout;
 using boost::shared_ptr;
@@ -54,17 +56,25 @@ DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log, boo
        : DCP (c)
        , _decode_referenced (false)
 {
-       video.reset (new VideoDecoder (this, c, log));
+       if (c->video) {
+               video.reset (new VideoDecoder (this, c, log));
+       }
        if (c->audio) {
                audio.reset (new AudioDecoder (this, c->audio, log, fast));
        }
        if (c->subtitle) {
                /* XXX: this time here should be the time of the first subtitle, not 0 */
-               subtitle.reset (new SubtitleDecoder (this, c->subtitle, log, ContentTime()));
+               subtitle.reset (new TextDecoder (this, c->subtitle, log, ContentTime()));
+       }
+
+       list<shared_ptr<dcp::CPL> > cpl_list = cpls ();
+
+       if (cpl_list.empty()) {
+               throw DCPError (_("No CPLs found in DCP."));
        }
 
        shared_ptr<dcp::CPL> cpl;
-       BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpls ()) {
+       BOOST_FOREACH (shared_ptr<dcp::CPL> i, cpl_list) {
                if (_dcp_content->cpl() && i->id() == _dcp_content->cpl().get()) {
                        cpl = i;
                }
@@ -188,22 +198,27 @@ DCPDecoder::pass_subtitles (ContentTime next)
 
        if ((*_reel)->main_subtitle() && (_decode_referenced || !_dcp_content->reference_subtitle())) {
                int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
-               list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
+               list<shared_ptr<dcp::Subtitle> > subs = (*_reel)->main_subtitle()->asset()->subtitles_during (
                        dcp::Time (entry_point + frame, vfr, vfr),
                        dcp::Time (entry_point + frame + 1, vfr, vfr),
                        true
                        );
 
-               BOOST_FOREACH (dcp::SubtitleString i, subs) {
-                       list<dcp::SubtitleString> s;
-                       s.push_back (i);
-                       subtitle->emit_text (
-                               ContentTimePeriod (
-                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.in().as_seconds ()),
-                                       ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i.out().as_seconds ())
-                                       ),
-                               s
-                               );
+               BOOST_FOREACH (shared_ptr<dcp::Subtitle> i, subs) {
+                       shared_ptr<dcp::SubtitleString> is = dynamic_pointer_cast<dcp::SubtitleString> (i);
+                       if (is) {
+                               list<dcp::SubtitleString> s;
+                               s.push_back (*is);
+                               subtitle->emit_plain (
+                                       ContentTimePeriod (
+                                               ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->in().as_seconds ()),
+                                               ContentTime::from_frames (_offset - entry_point, vfr) + ContentTime::from_seconds (i->out().as_seconds ())
+                                               ),
+                                       s
+                                       );
+                       }
+
+                       /* XXX: image subtitles */
                }
        }
 }
@@ -253,6 +268,10 @@ DCPDecoder::get_readers ()
 void
 DCPDecoder::seek (ContentTime t, bool accurate)
 {
+       if (!_dcp_content->can_be_played ()) {
+               return;
+       }
+
        Decoder::seek (t, accurate);
 
        _reel = _reels.begin ();
@@ -271,7 +290,9 @@ DCPDecoder::seek (ContentTime t, bool accurate)
        /* Seek to pre-roll position */
 
        while (_reel != _reels.end() && pre >= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ())) {
-               pre -= ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+               ContentTime rd = ContentTime::from_frames ((*_reel)->main_picture()->duration(), _dcp_content->active_video_frame_rate ());
+               pre -= rd;
+               t -= rd;
                next_reel ();
        }
 
@@ -298,8 +319,12 @@ DCPDecoder::set_decode_referenced (bool r)
 {
        _decode_referenced = r;
 
-       video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
-       audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
+       if (video) {
+               video->set_ignore (_dcp_content->reference_video() && !_decode_referenced);
+       }
+       if (audio) {
+               audio->set_ignore (_dcp_content->reference_audio() && !_decode_referenced);
+       }
 }
 
 void