Merge installer branch.

diff --git a/ChangeLog b/ChangeLog
index e23e96c217fe64b05417fc5093fddd684b821f66..fea0ebc786c29698b8f9438dbe4bee76dc558109 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-28  Carl Hetherington  <cth@carlh.net>
 
+       * Try to prevent Windows machines going to sleep during encodes.
+
        * Add option to not install main program / server on Windows.
 
 2014-01-26  Carl Hetherington  <cth@carlh.net>

diff --git a/cscript b/cscript
index 05e8da2888eee998f0a7ac8a4bc7f39a238965cd..4103f936675791d5545496f44f1aa95902b1a9cc 100644 (file)
--- a/cscript
+++ b/cscript
@@ -123,7 +123,7 @@ def make_control(version, bits, filename, debug):
             print >>f,'Architecture: amd64'
         print >>f,'Section: debug'
         print >>f,'Priority: extra'
-        print >>f,'Depends: ${dcpomatic:Depends}, ${misc:Depends}'
+        packages('Depends', depends[version], f)
         print >>f,'Description: debugging symbols for dcpomatic'
         print >>f,'  This package contains the debugging symbols for dcpomatic.'
         print >>f,''

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 57b3f93b24d9dde847ff6fa123539526d6d259bb..9f7a761248aef9f045ba85a14e05356a066b5a4b 100644 (file)
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -298,3 +298,11 @@ dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
        return fseek (stream, offset, whence);
 #endif 
 }
+
+void
+kick ()
+{
+#ifdef DCPOMATIC_WINDOWS
+       SetThreadExecutionState (ES_CONTINUOUS);
+#endif 
+}

diff --git a/src/lib/cross.h b/src/lib/cross.h
index 7e032e5a1c808006e0c35860f9be6522f358bc9b..822b36631d604343a94c5b5a03f48b75d8aa31cf 100644 (file)
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -35,3 +35,4 @@ extern boost::filesystem::path app_contents ();
 #endif
 extern FILE * fopen_boost (boost::filesystem::path, std::string);
 extern int dcpomatic_fseek (FILE *, int64_t, int);
+void kick ();

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index fbec3e4d0d0e65c2a4dfa51653e0461d18873777..92b4763be5768f5ca04c5f40621191d6ef52cb4b 100644 (file)
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -180,6 +180,8 @@ Encoder::frame_done ()
 void
 Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same)
 {
+       kick ();
+       
        boost::mutex::scoped_lock lock (_mutex);
 
        /* XXX: discard 3D here if required */