#include "dcpomatic_assert.h"
#include "exceptions.h"
#include "file_group.h"
+#include <dcp/filesystem.h>
#include <sndfile.h>
#include <cstdio>
}
-/** Destroy a FileGroup, closing any open file */
-FileGroup::~FileGroup ()
-{
- if (_current_file) {
- fclose (_current_file);
- }
-}
-
-
void
FileGroup::set_paths (vector<boost::filesystem::path> const & p)
{
}
if (_current_file) {
- fclose (_current_file);
+ _current_file->close();
}
_current_path = p;
- _current_file = fopen_boost (_paths[_current_path], "rb");
+ _current_file = dcp::File(_paths[_current_path], "rb");
if (!_current_file) {
throw OpenFileError (_paths[_current_path], errno, OpenFileError::READ);
}
- _current_size = boost::filesystem::file_size (_paths[_current_path]);
+ _current_size = dcp::filesystem::file_size(_paths[_current_path]);
}
size_t i = 0;
int64_t sub_pos = _position;
while (i < _paths.size()) {
- boost::uintmax_t len = boost::filesystem::file_size (_paths[i]);
+ boost::uintmax_t len = dcp::filesystem::file_size(_paths[i]);
if (sub_pos < int64_t(len)) {
break;
}
if (i < _paths.size()) {
ensure_open_path (i);
- dcpomatic_fseek (_current_file, sub_pos, SEEK_SET);
+ _current_file->seek(sub_pos, SEEK_SET);
} else {
ensure_open_path (_paths.size() - 1);
- dcpomatic_fseek (_current_file, _current_size, SEEK_SET);
+ _current_file->seek(_current_size, SEEK_SET);
}
return _position;
/** Try to read some data from the current position into a buffer.
* @param buffer Buffer to write data into.
* @param amount Number of bytes to read.
- * @return Number of bytes read.
*/
-int
+FileGroup::Result
FileGroup::read (uint8_t* buffer, int amount) const
{
+ DCPOMATIC_ASSERT (_current_file);
+
int read = 0;
while (true) {
DCPOMATIC_ASSERT (_current_file);
-#ifdef DCPOMATIC_WINDOWS
- int64_t const current_position = _ftelli64 (_current_file);
+ auto const current_position = _current_file->tell();
if (current_position == -1) {
to_read = 0;
eof = true;
to_read = _current_size - current_position;
eof = true;
}
-#else
- long const current_position = ftell(_current_file);
- if ((current_position + to_read) > _current_size) {
- to_read = _current_size - current_position;
- eof = true;
- }
-#endif
- int const this_time = fread (buffer + read, 1, to_read, _current_file);
+ int const this_time = _current_file->read(buffer + read, 1, to_read);
read += this_time;
_position += this_time;
if (read == amount) {
break;
}
- if (ferror(_current_file)) {
+ if (_current_file->error()) {
throw FileError (String::compose("fread error %1", errno), _paths[_current_path]);
}
if (eof) {
/* See if there is another file to use */
if ((_current_path + 1) >= _paths.size()) {
- break;
+ return { read, true };
}
ensure_open_path (_current_path + 1);
}
}
- return read;
+ return { read, false };
}
{
int64_t len = 0;
for (size_t i = 0; i < _paths.size(); ++i) {
- len += boost::filesystem::file_size (_paths[i]);
+ len += dcp::filesystem::file_size(_paths[i]);
}
return len;