diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-11 00:54:31 +0000 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-03-11 00:54:31 +0000 |
| commit | dd4a1ff4b50f58c27af223202454f80d45de4af1 (patch) | |
| tree | 13bbd8e81feeb8fa8902dcaa351d431ed703a0ed | |
| parent | d50455e0465240b6b050a95703856c820c2769fe (diff) | |
Added compiler warning overrides
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/ApplicationHost.cs | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index b97afc217d..926dfe9553 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -929,8 +929,10 @@ namespace MediaBrowser.Api.Playback // MUST read both stdout and stderr asynchronously or a deadlock may occurr process.BeginOutputReadLine(); +#pragma warning disable 4014 // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback process.StandardError.BaseStream.CopyToAsync(state.LogFileStream); +#pragma warning restore 4014 // Wait for the file to exist before proceeeding while (!File.Exists(outputPath)) diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index 25b9c687cb..68e9e0c781 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -886,8 +886,10 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder var memoryStream = new MemoryStream(); +#pragma warning disable 4014 // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback process.StandardOutput.BaseStream.CopyToAsync(memoryStream); +#pragma warning restore 4014 // MUST read both stdout and stderr asynchronously or a deadlock may occurr process.BeginErrorReadLine(); diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs index 479e07ee6c..690d615ff3 100644 --- a/MediaBrowser.ServerApplication/ApplicationHost.cs +++ b/MediaBrowser.ServerApplication/ApplicationHost.cs @@ -755,7 +755,9 @@ namespace MediaBrowser.ServerApplication #if DEBUG return false; #endif +#pragma warning disable 162 return NativeApp.CanSelfUpdate; +#pragma warning restore 162 } } |