X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffile_group.cc;h=6f6a5a9162245f85ecb81a6178929c5782b3ff99;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=54ec8280c0a6830da2a671137dc7a4f45336b61b;hpb=39bc73fe192f932ed6695eb87b19de446e8b4f55;p=dcpomatic.git diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc index 54ec8280c..6f6a5a916 100644 --- a/src/lib/file_group.cc +++ b/src/lib/file_group.cc @@ -82,7 +82,7 @@ FileGroup::ensure_open_path (size_t p) const /* Already open */ return; } - + if (_current_file) { fclose (_current_file); } @@ -111,9 +111,9 @@ FileGroup::seek (int64_t pos, int whence) const } #ifdef DCPOMATIC_WINDOWS full_pos += _ftelli64 (_current_file); -#else +#else full_pos += ftell (_current_file); -#endif +#endif full_pos += pos; break; case SEEK_END: @@ -151,7 +151,7 @@ int FileGroup::read (uint8_t* buffer, int amount) const { int read = 0; - while (1) { + while (true) { int const this_time = fread (buffer + read, 1, amount - read, _current_file); read += this_time; if (read == amount) {