Bump libdcp for verification fixes.

[libsub.git] / src / reader.h

diff --git a/src/reader.h b/src/reader.h
index 8aa9fd891443ec26dd1d88186da157220062a4f2..aab73840ab09c0c0cae1e4d7469a956f852a2cc7 100644 (file)
--- a/src/reader.h
+++ b/src/reader.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 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
@@ -20,17 +20,24 @@
 #ifndef LIBSUB_READER_H
 #define LIBSUB_READER_H
 
-#include "subtitle.h"
-#include <list>
+#include "raw_subtitle.h"
 #include <map>
 #include <string>
+#include <vector>
+
+struct subrip_reader_convert_line_test;
 
 namespace sub {
 
+/** @class Reader
+ *  @brief Parent for classes which can read particular subtitle formats.
+ */
 class Reader
 {
 public:
-       std::list<Subtitle> subtitles () const {
+       virtual ~Reader () {}
+
+       std::vector<RawSubtitle> subtitles () const {
                return _subs;
        }
 
@@ -39,9 +46,11 @@ public:
        }
 
 protected:
+       friend struct ::subrip_reader_convert_line_test;
+
        void warn (std::string) const;
 
-       std::list<Subtitle> _subs;
+       std::vector<RawSubtitle> _subs;
 };
 
 }