Fix font_id_map errors when importing DCP subtitles that have no

[dcpomatic.git] / src / lib / video_mxf_decoder.h

diff --git a/src/lib/video_mxf_decoder.h b/src/lib/video_mxf_decoder.h
index fa9bfe818767d25c89e8f025affc40b9fa381d72..774e269c6d5da15275e1ccf61259f4ad1f510fa3 100644 (file)
--- a/src/lib/video_mxf_decoder.h
+++ b/src/lib/video_mxf_decoder.h
@@ -1,37 +1,48 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+
 #include "decoder.h"
+#include <dcp/mono_picture_asset_reader.h>
+#include <dcp/stereo_picture_asset_reader.h>
+
 
 class VideoMXFContent;
 class Log;
 
+
 class VideoMXFDecoder : public Decoder
 {
 public:
-       VideoMXFDecoder (boost::shared_ptr<const VideoMXFContent>, boost::shared_ptr<Log> log);
+       VideoMXFDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const VideoMXFContent>);
+
+       bool pass () override;
+       void seek (dcpomatic::ContentTime t, bool accurate) override;
 
 private:
-       bool pass (PassReason, bool accurate);
-       void seek (ContentTime t, bool accurate);
 
-       boost::shared_ptr<const VideoMXFContent> _content;
+       std::shared_ptr<const VideoMXFContent> _content;
        /** Time of next thing to return from pass */
-       ContentTime _next;
+       dcpomatic::ContentTime _next;
+
+       std::shared_ptr<dcp::MonoPictureAssetReader> _mono_reader;
+       std::shared_ptr<dcp::StereoPictureAssetReader> _stereo_reader;
+       dcp::Size _size;
 };