X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_group.h;h=693bf89baeb800757fa61acfdeccb243eeb02ae5;hb=ff639b3cf30afcc097bfd21d39c8d15f466cadd6;hp=99803d3869fdd9b0f6367bcdf7a8c39cd2ba16c5;hpb=5a999debb53087de8188603ea9b9d928b2293978;p=dcpomatic.git

diff --git a/src/lib/file_group.h b/src/lib/file_group.h
index 99803d386..693bf89ba 100644
--- a/src/lib/file_group.h
+++ b/src/lib/file_group.h
@@ -1,34 +1,53 @@
 /*
-    Copyright (C) 2013 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.
+ */
 class FileGroup
 {
 public:
-	FileGroup (boost::filesystem::path);
-	FileGroup (std::vector<boost::filesystem::path> const &);
-	~FileGroup ();
+	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 &);
 
 	int64_t seek (int64_t, int) const;
 	int read (uint8_t*, int) const;
@@ -39,8 +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_path = 0;
+	mutable boost::optional<dcp::File> _current_file;
+	mutable size_t _current_size = 0;
+	mutable int64_t _position = 0;
 };
 
+
 #endif