projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check _inter_size in ::has_j2k() (fixes #2086).
[dcpomatic.git]
/
src
/
lib
/
file_group.h
diff --git
a/src/lib/file_group.h
b/src/lib/file_group.h
index 800d9a059ec949e19497f2aca0256ab7bd9feeb2..9521da7ec88c85b016dc2ef6889030d7c048a97a 100644
(file)
--- a/
src/lib/file_group.h
+++ b/
src/lib/file_group.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,16
+18,20
@@
*/
*/
+
/** @file src/lib/file_group.h
* @brief FileGroup class.
*/
/** @file src/lib/file_group.h
* @brief FileGroup class.
*/
+
#ifndef DCPOMATIC_FILE_GROUP_H
#define DCPOMATIC_FILE_GROUP_H
#ifndef DCPOMATIC_FILE_GROUP_H
#define DCPOMATIC_FILE_GROUP_H
+
#include <boost/filesystem.hpp>
#include <vector>
#include <boost/filesystem.hpp>
#include <vector>
+
/** @class FileGroup
* @brief A class to make a list of files behave like they were concatenated.
*/
/** @class FileGroup
* @brief A class to make a list of files behave like they were concatenated.
*/
@@
-39,6
+43,9
@@
public:
explicit FileGroup (std::vector<boost::filesystem::path> const &);
~FileGroup ();
explicit FileGroup (std::vector<boost::filesystem::path> const &);
~FileGroup ();
+ 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;
void set_paths (std::vector<boost::filesystem::path> const &);
int64_t seek (int64_t, int) const;
@@
-50,8
+57,11
@@
private:
std::vector<boost::filesystem::path> _paths;
/** Index of path that we are currently reading from */
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 FILE* _current_file = nullptr;
+ mutable size_t _current_size = 0;
+ mutable int64_t _position = 0;
};
};
+
#endif
#endif