projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add UTC-3:30 timezone to cinema (#831).
[dcpomatic.git]
/
src
/
lib
/
file_group.cc
diff --git
a/src/lib/file_group.cc
b/src/lib/file_group.cc
index 54ec8280c0a6830da2a671137dc7a4f45336b61b..5cfe021192ec9d3adf86150280fd849dab4fa98d 100644
(file)
--- a/
src/lib/file_group.cc
+++ b/
src/lib/file_group.cc
@@
-26,6
+26,7
@@
#include "file_group.h"
#include "exceptions.h"
#include "cross.h"
#include "file_group.h"
#include "exceptions.h"
#include "cross.h"
+#include <iostream>
using std::vector;
using std::cout;
using std::vector;
using std::cout;
@@
-82,7
+83,7
@@
FileGroup::ensure_open_path (size_t p) const
/* Already open */
return;
}
/* Already open */
return;
}
-
+
if (_current_file) {
fclose (_current_file);
}
if (_current_file) {
fclose (_current_file);
}
@@
-111,9
+112,9
@@
FileGroup::seek (int64_t pos, int whence) const
}
#ifdef DCPOMATIC_WINDOWS
full_pos += _ftelli64 (_current_file);
}
#ifdef DCPOMATIC_WINDOWS
full_pos += _ftelli64 (_current_file);
-#else
+#else
full_pos += ftell (_current_file);
full_pos += ftell (_current_file);
-#endif
+#endif
full_pos += pos;
break;
case SEEK_END:
full_pos += pos;
break;
case SEEK_END:
@@
-151,7
+152,7
@@
int
FileGroup::read (uint8_t* buffer, int amount) const
{
int read = 0;
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) {
int const this_time = fread (buffer + read, 1, amount - read, _current_file);
read += this_time;
if (read == amount) {