Bump libdcp.

[libsub.git] / src / subrip_reader.h

diff --git a/src/subrip_reader.h b/src/subrip_reader.h
index 9b9ff920f548d0eb27a43d527fe20060a221fe5f..8d3fd4c124357e3a0723a84335b576917257ca7d 100644 (file)
--- a/src/subrip_reader.h
+++ b/src/subrip_reader.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 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
@@ -17,14 +17,21 @@
 
 */
 
+/** @file  src/subrip_reader.h
+ *  @brief SubripReader class.
+ */
+
 #ifndef LIBSUB_SUBRIP_READER_H
 #define LIBSUB_SUBRIP_READER_H
 
 #include "reader.h"
-#include "time_pair.h"
+#include <boost/function.hpp>
+#include <list>
 
 struct subrip_reader_convert_line_test;
 struct subrip_reader_convert_time_test;
+struct subrip_reader_test5;
+struct subrip_reader_test6;
 
 namespace sub {
 
@@ -32,16 +39,22 @@ class SubripReader : public Reader
 {
 public:
        SubripReader (FILE* f);
+       SubripReader (std::string subs);
 
 private:
        /* For tests */
        friend struct ::subrip_reader_convert_line_test;
        friend struct ::subrip_reader_convert_time_test;
+       friend struct ::subrip_reader_test5;
+       friend struct ::subrip_reader_test6;
        SubripReader () {}
-       
-       static TimePair convert_time (std::string t);
-       void convert_line (std::string t, int line_number, TimePair from, TimePair to);
+
+       Time convert_time (std::string t);
+       void convert_line (std::string t, RawSubtitle& p);
        void maybe_content (RawSubtitle& p);
+       void read (boost::function<boost::optional<std::string> ()> get_line);
+
+       std::list<std::string> _context;
 };
 
 }