X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_group.h;h=693bf89baeb800757fa61acfdeccb243eeb02ae5;hb=f64f48051c9054830561a868a320b8003126134a;hp=a696343a0ca14e118109496f2e0a5fed33a8a069;hpb=a386c56bac6b76a3db43dbb8ea2dca9538860788;p=dcpomatic.git

diff --git a/src/lib/file_group.h b/src/lib/file_group.h
index a696343a0..693bf89ba 100644
--- a/src/lib/file_group.h
+++ b/src/lib/file_group.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,16 +18,22 @@
 
 */
 
+
 /** @file  src/lib/file_group.h
  *  @brief FileGroup class.
  */
 
+
 #ifndef DCPOMATIC_FILE_GROUP_H
 #define DCPOMATIC_FILE_GROUP_H
 
+
+#include <dcp/file.h>
 #include <boost/filesystem.hpp>
+#include <boost/optional.hpp>
 #include <vector>
 
+
 /** @class FileGroup
  *  @brief A class to make a list of files behave like they were concatenated.
  */
@@ -37,7 +43,6 @@ public:
 	FileGroup ();
 	explicit FileGroup (boost::filesystem::path);
 	explicit FileGroup (std::vector<boost::filesystem::path> const &);
-	~FileGroup ();
 
 	FileGroup (FileGroup const&) = delete;
 	FileGroup& operator= (FileGroup const&) = delete;
@@ -53,10 +58,11 @@ private:
 
 	std::vector<boost::filesystem::path> _paths;
 	/** Index of path that we are currently reading from */
-	mutable size_t _current_path;
-	mutable FILE* _current_file;
-	mutable size_t _current_size;
-	mutable int64_t _position;
+	mutable size_t _current_path = 0;
+	mutable boost::optional<dcp::File> _current_file;
+	mutable size_t _current_size = 0;
+	mutable int64_t _position = 0;
 };
 
+
 #endif