diff options
Diffstat (limited to 'MediaBrowser.ServerApplication')
3 files changed, 34 insertions, 28 deletions
diff --git a/MediaBrowser.ServerApplication/EntryPoints/KeepServerAwake.cs b/MediaBrowser.ServerApplication/EntryPoints/KeepServerAwake.cs index 42b6c3164a..9881bdf18d 100644 --- a/MediaBrowser.ServerApplication/EntryPoints/KeepServerAwake.cs +++ b/MediaBrowser.ServerApplication/EntryPoints/KeepServerAwake.cs @@ -1,9 +1,9 @@ using MediaBrowser.Controller.Plugins; using MediaBrowser.Controller.Session; using MediaBrowser.Model.Logging; +using MediaBrowser.ServerApplication.Native; using System; using System.Linq; -using System.Runtime.InteropServices; using System.Threading; namespace MediaBrowser.ServerApplication.EntryPoints @@ -37,7 +37,7 @@ namespace MediaBrowser.ServerApplication.EntryPoints { try { - SystemHelper.ResetStandbyTimer(); + NativeApp.PreventSystemStandby(); } catch (Exception ex) { @@ -54,25 +54,4 @@ namespace MediaBrowser.ServerApplication.EntryPoints } } } - - internal enum EXECUTION_STATE : uint - { - ES_NONE = 0, - ES_SYSTEM_REQUIRED = 0x00000001, - ES_DISPLAY_REQUIRED = 0x00000002, - ES_USER_PRESENT = 0x00000004, - ES_AWAYMODE_REQUIRED = 0x00000040, - ES_CONTINUOUS = 0x80000000 - } - - public class SystemHelper - { - [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] - static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags); - - public static void ResetStandbyTimer() - { - EXECUTION_STATE es = SetThreadExecutionState(EXECUTION_STATE.ES_SYSTEM_REQUIRED); - } - } } diff --git a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs index 19aa7a6843..b4fc47d02f 100644 --- a/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs +++ b/MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloadInfo.cs @@ -194,12 +194,12 @@ namespace MediaBrowser.ServerApplication.FFMpeg var uname = new Uname(); #if __MonoCS__ - Utsname uname; - var callResult = Syscall.uname(out uname); + Utsname utsname; + var callResult = Syscall.uname(out utsname); if (callResult == 0) { - uname.sysname= uname.sysname; - uname.machine= uname.machine; + uname.sysname= utsname.sysname; + uname.machine= utsname.machine; } #endif return uname; diff --git a/MediaBrowser.ServerApplication/Native/NativeApp.cs b/MediaBrowser.ServerApplication/Native/NativeApp.cs index 646a7bc98b..2388b610b7 100644 --- a/MediaBrowser.ServerApplication/Native/NativeApp.cs +++ b/MediaBrowser.ServerApplication/Native/NativeApp.cs @@ -1,4 +1,5 @@ - +using System.Runtime.InteropServices; + namespace MediaBrowser.ServerApplication.Native { /// <summary> @@ -57,5 +58,31 @@ namespace MediaBrowser.ServerApplication.Native return MainStartup.CanSelfUpdate; } } + + public static void PreventSystemStandby() + { + SystemHelper.ResetStandbyTimer(); + } + + internal enum EXECUTION_STATE : uint + { + ES_NONE = 0, + ES_SYSTEM_REQUIRED = 0x00000001, + ES_DISPLAY_REQUIRED = 0x00000002, + ES_USER_PRESENT = 0x00000004, + ES_AWAYMODE_REQUIRED = 0x00000040, + ES_CONTINUOUS = 0x80000000 + } + + public class SystemHelper + { + [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)] + static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags); + + public static void ResetStandbyTimer() + { + EXECUTION_STATE es = SetThreadExecutionState(EXECUTION_STATE.ES_SYSTEM_REQUIRED); + } + } } } |