*/
-#include <dcp/subtitle_content.h>
#include "dcp_subtitle_decoder.h"
#include "dcp_subtitle_content.h"
+#include <dcp/interop_subtitle_content.h>
using std::list;
using std::cout;
DCPSubtitleDecoder::DCPSubtitleDecoder (shared_ptr<const DCPSubtitleContent> content)
: SubtitleDecoder (content)
{
- dcp::SubtitleContent c (content->path (0), false);
- _subtitles = c.subtitles ();
+ shared_ptr<dcp::SubtitleContent> c (load (content->path (0)));
+ _subtitles = c->subtitles ();
_next = _subtitles.begin ();
}
}
bool
-DCPSubtitleDecoder::pass ()
+DCPSubtitleDecoder::pass (PassReason)
{
if (_next == _subtitles.end ()) {
return true;
}
list<ContentTimePeriod>
-DCPSubtitleDecoder::subtitles_during (ContentTimePeriod p, bool starting) const
+DCPSubtitleDecoder::image_subtitles_during (ContentTimePeriod, bool) const
+{
+ return list<ContentTimePeriod> ();
+}
+
+list<ContentTimePeriod>
+DCPSubtitleDecoder::text_subtitles_during (ContentTimePeriod p, bool starting) const
{
/* XXX: inefficient */