X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffile_group.h;h=800d9a059ec949e19497f2aca0256ab7bd9feeb2;hp=5a65de96f7584e3afdab1ad71fd928f5df3b3005;hb=HEAD;hpb=cc27c2716f755305d67f1e1ba828ecf37f8405dd

diff --git a/src/lib/file_group.h b/src/lib/file_group.h
index 5a65de96f..aac72c228 100644
--- a/src/lib/file_group.h
+++ b/src/lib/file_group.h
@@ -1,31 +1,38 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-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/>.
 
 */
 
+
 /** @file  src/lib/file_group.h
  *  @brief FileGroup class.
  */
 
+
 #ifndef DCPOMATIC_FILE_GROUP_H
 #define DCPOMATIC_FILE_GROUP_H
 
-#include <vector>
+
+#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.
@@ -34,14 +41,26 @@ class FileGroup
 {
 public:
 	FileGroup ();
-	FileGroup (boost::filesystem::path);
-	FileGroup (std::vector<boost::filesystem::path> const &);
-	~FileGroup ();
+	explicit FileGroup (boost::filesystem::path);
+	explicit FileGroup (std::vector<boost::filesystem::path> const &);
+
+	FileGroup (FileGroup const&) = delete;
+	FileGroup& operator= (FileGroup const&) = delete;
 
 	void set_paths (std::vector<boost::filesystem::path> const &);
 
+	struct Result {
+		Result(int bytes_read_, bool eof_)
+			: bytes_read(bytes_read_)
+			, eof(eof_)
+		{}
+
+		int bytes_read = 0;
+		bool eof = false;
+	};
+
 	int64_t seek (int64_t, int) const;
-	int read (uint8_t*, int) const;
+	Result read (uint8_t*, int) const;
 	int64_t length () const;
 
 private:
@@ -49,8 +68,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_path = 0;
+	mutable boost::optional<dcp::File> _current_file;
+	mutable size_t _current_size = 0;
+	mutable int64_t _position = 0;
 };
 
+
 #endif