Supporters update.

[dcpomatic.git] / src / lib / file_group.cc

diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index 7dae1da92c26690f40ccdff9c4dd7d026d3d24d1..228faa74ddd6818cf5ae9fe21287335c572117f1 100644 (file)
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -29,6 +29,7 @@
 #include "dcpomatic_assert.h"
 #include "exceptions.h"
 #include "file_group.h"
+#include <dcp/filesystem.h>
 #include <sndfile.h>
 #include <cstdio>
 
@@ -61,15 +62,6 @@ FileGroup::FileGroup (vector<boost::filesystem::path> const & p)
 }
 
 
-/** 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)
 {
@@ -89,15 +81,15 @@ FileGroup::ensure_open_path (size_t p) const
        }
 
        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]);
 }
 
 
@@ -120,7 +112,7 @@ FileGroup::seek (int64_t pos, int whence) const
        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;
                }
@@ -130,10 +122,10 @@ FileGroup::seek (int64_t pos, int whence) const
 
        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;
@@ -143,11 +135,12 @@ FileGroup::seek (int64_t pos, int whence) const
 /** 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) {
 
@@ -156,8 +149,7 @@ FileGroup::read (uint8_t* buffer, int amount) const
 
                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;
@@ -165,15 +157,8 @@ FileGroup::read (uint8_t* buffer, int amount) const
                        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) {
@@ -181,20 +166,20 @@ FileGroup::read (uint8_t* buffer, int amount) const
                        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 };
 }
 
 
@@ -204,7 +189,7 @@ FileGroup::length () const
 {
        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;