Merge master.

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

diff --git a/src/lib/subrip_decoder.cc b/src/lib/subrip_decoder.cc
index 013c6fab7e6d2eab6f93b0ea290ac27fb3dae553..e832c2d849d7d09a47de30a8027301d8e9cf380c 100644 (file)
--- a/src/lib/subrip_decoder.cc
+++ b/src/lib/subrip_decoder.cc
@@ -19,20 +19,24 @@
 
 #include <dcp/subtitle_string.h>
 #include "subrip_decoder.h"
+#include "subrip_content.h"
 
 using std::list;
 using boost::shared_ptr;
 
 SubRipDecoder::SubRipDecoder (shared_ptr<const SubRipContent> content)
-       : SubRip (content)
+       : SubtitleDecoder (content)
+       , SubRip (content)
        , _next (0)
 {
 
 }
 
 void
-SubRipDecoder::seek (ContentTime time, bool)
+SubRipDecoder::seek (ContentTime time, bool accurate)
 {
+       SubtitleDecoder::seek (time, accurate);
+       
        _next = 0;
        list<SubRipSubtitlePiece>::const_iterator i = _subtitles[_next].pieces.begin();
        while (i != _subtitles[_next].pieces.end() && _subtitles[_next].from < time) {