projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an assert.
[dcpomatic.git]
/
src
/
lib
/
file_group.cc
diff --git
a/src/lib/file_group.cc
b/src/lib/file_group.cc
index f4d50028ecdc1037ae1547818e30248992fd64d4..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 "dcpomatic_assert.h"
#include "exceptions.h"
#include "file_group.h"
+#include <dcp/filesystem.h>
#include <sndfile.h>
#include <cstdio>
#include <sndfile.h>
#include <cstdio>
@@
-88,7
+89,7
@@
FileGroup::ensure_open_path (size_t p) const
if (!_current_file) {
throw OpenFileError (_paths[_current_path], errno, OpenFileError::READ);
}
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]);
}
}
@@
-111,7
+112,7
@@
FileGroup::seek (int64_t pos, int whence) const
size_t i = 0;
int64_t sub_pos = _position;
while (i < _paths.size()) {
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 (sub_pos < int64_t(len)) {
break;
}
@@
-188,7
+189,7
@@
FileGroup::length () const
{
int64_t len = 0;
for (size_t i = 0; i < _paths.size(); ++i) {
{
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;
}
return len;