projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
cross.cc
diff --git
a/src/lib/cross.cc
b/src/lib/cross.cc
index 70f643913abfa9cab7e22b20858fc7edc7648602..d84c17c55b25318ef5b32a0a06eda8ee23ac1d16 100644
(file)
--- a/
src/lib/cross.cc
+++ b/
src/lib/cross.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012
-2014
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-202,7
+202,7
@@
run_ffprobe (boost::filesystem::path content, boost::filesystem::path out, share
CloseHandle (child_stderr_write);
CloseHandle (child_stderr_write);
- while (
1
) {
+ while (
true
) {
char buffer[512];
DWORD read;
if (!ReadFile(child_stderr_read, buffer, sizeof(buffer), &read, 0) || read == 0) {
char buffer[512];
DWORD read;
if (!ReadFile(child_stderr_read, buffer, sizeof(buffer), &read, 0) || read == 0) {
@@
-247,7
+247,7
@@
mount_info ()
return m;
}
return m;
}
- while (
1
) {
+ while (
true
) {
struct mntent* mnt = getmntent (f);
if (!mnt) {
break;
struct mntent* mnt = getmntent (f);
if (!mnt) {
break;
@@
-310,7
+310,7
@@
void
Waker::nudge ()
{
#ifdef DCPOMATIC_WINDOWS
Waker::nudge ()
{
#ifdef DCPOMATIC_WINDOWS
- SetThreadExecutionState (ES_
CONTINUOUS
);
+ SetThreadExecutionState (ES_
SYSTEM_REQUIRED
);
#endif
}
#endif
}