projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
White space.
[dcpomatic.git]
/
src
/
lib
/
file_group.h
diff --git
a/src/lib/file_group.h
b/src/lib/file_group.h
index 5a65de96f7584e3afdab1ad71fd928f5df3b3005..9521da7ec88c85b016dc2ef6889030d7c048a97a 100644
(file)
--- a/
src/lib/file_group.h
+++ b/
src/lib/file_group.h
@@
-1,31
+1,36
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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.
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
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.
*/
/** @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 <vector>
+
#include <boost/filesystem.hpp>
#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.
@@
-34,10
+39,13
@@
class FileGroup
{
public:
FileGroup ();
{
public:
FileGroup ();
- FileGroup (boost::filesystem::path);
- FileGroup (std::vector<boost::filesystem::path> const &);
+
explicit
FileGroup (boost::filesystem::path);
+
explicit
FileGroup (std::vector<boost::filesystem::path> const &);
~FileGroup ();
~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;
@@
-49,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