projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump ffmpeg to 5.1.2 "Riemann"
[dcpomatic.git]
/
src
/
lib
/
content.cc
diff --git
a/src/lib/content.cc
b/src/lib/content.cc
index 97edc7c892c33612263ae14b33e403d3a0b1bd11..6324050ec69a22f056cc3bedb4c1c7ae2ff002f0 100644
(file)
--- a/
src/lib/content.cc
+++ b/
src/lib/content.cc
@@
-93,7
+93,7
@@
Content::Content (cxml::ConstNodePtr node)
_last_write_times.push_back (*mod);
} else {
boost::system::error_code ec;
_last_write_times.push_back (*mod);
} else {
boost::system::error_code ec;
- auto last_write =
boost
::filesystem::last_write_time(i->content(), ec);
+ auto last_write =
dcp
::filesystem::last_write_time(i->content(), ec);
_last_write_times.push_back (ec ? 0 : last_write);
}
}
_last_write_times.push_back (ec ? 0 : last_write);
}
}
@@
-187,7
+187,7
@@
Content::examine (shared_ptr<const Film>, shared_ptr<Job> job)
_last_write_times.clear ();
for (auto i: _paths) {
boost::system::error_code ec;
_last_write_times.clear ();
for (auto i: _paths) {
boost::system::error_code ec;
- auto last_write =
boost
::filesystem::last_write_time(i, ec);
+ auto last_write =
dcp
::filesystem::last_write_time(i, ec);
_last_write_times.push_back (ec ? 0 : last_write);
}
}
_last_write_times.push_back (ec ? 0 : last_write);
}
}
@@
-339,7
+339,7
@@
bool
Content::paths_valid () const
{
for (auto i: _paths) {
Content::paths_valid () const
{
for (auto i: _paths) {
- if (!
boost::filesystem::exists
(i)) {
+ if (!
dcp::filesystem::exists
(i)) {
return false;
}
}
return false;
}
}
@@
-359,7
+359,7
@@
Content::set_paths (vector<boost::filesystem::path> paths)
_last_write_times.clear ();
for (auto i: _paths) {
boost::system::error_code ec;
_last_write_times.clear ();
for (auto i: _paths) {
boost::system::error_code ec;
- auto last_write =
boost
::filesystem::last_write_time(i, ec);
+ auto last_write =
dcp
::filesystem::last_write_time(i, ec);
_last_write_times.push_back (ec ? 0 : last_write);
}
}
_last_write_times.push_back (ec ? 0 : last_write);
}
}
@@
-552,7
+552,7
@@
Content::add_path (boost::filesystem::path p)
boost::mutex::scoped_lock lm (_mutex);
_paths.push_back (p);
boost::system::error_code ec;
boost::mutex::scoped_lock lm (_mutex);
_paths.push_back (p);
boost::system::error_code ec;
- auto last_write =
boost
::filesystem::last_write_time(p, ec);
+ auto last_write =
dcp
::filesystem::last_write_time(p, ec);
_last_write_times.push_back (ec ? 0 : last_write);
}
_last_write_times.push_back (ec ? 0 : last_write);
}
@@
-562,7
+562,7
@@
Content::changed () const
{
bool write_time_changed = false;
for (auto i = 0U; i < _paths.size(); ++i) {
{
bool write_time_changed = false;
for (auto i = 0U; i < _paths.size(); ++i) {
- if (
boost
::filesystem::last_write_time(_paths[i]) != last_write_time(i)) {
+ if (
dcp
::filesystem::last_write_time(_paths[i]) != last_write_time(i)) {
write_time_changed = true;
break;
}
write_time_changed = true;
break;
}