X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_group.h;h=9521da7ec88c85b016dc2ef6889030d7c048a97a;hb=cf9e7b9d0fb2545139dbd9bdc4c3313e7312ac66;hp=865e6bd223966f059b6f0fdd055c4f5941ab20c5;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/file_group.h b/src/lib/file_group.h index 865e6bd22..9521da7ec 100644 --- a/src/lib/file_group.h +++ b/src/lib/file_group.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,16 +18,20 @@ */ + /** @file src/lib/file_group.h * @brief FileGroup class. */ + #ifndef DCPOMATIC_FILE_GROUP_H #define DCPOMATIC_FILE_GROUP_H + #include #include + /** @class FileGroup * @brief A class to make a list of files behave like they were concatenated. */ @@ -35,10 +39,13 @@ class FileGroup { public: FileGroup (); - FileGroup (boost::filesystem::path); - FileGroup (std::vector const &); + explicit FileGroup (boost::filesystem::path); + explicit FileGroup (std::vector const &); ~FileGroup (); + FileGroup (FileGroup const&) = delete; + FileGroup& operator= (FileGroup const&) = delete; + void set_paths (std::vector const &); int64_t seek (int64_t, int) const; @@ -50,8 +57,11 @@ private: std::vector _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 FILE* _current_file = nullptr; + mutable size_t _current_size = 0; + mutable int64_t _position = 0; }; + #endif