Merge pull request #731 from timhobbs/master

Video player updates

6 files changed, 16 insertions, 0 deletions

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 04e861d5b..3993866cf 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -940,8 +940,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.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 2145860c7..3df25425d 100644
--- a/MediaBrowser.Model/Configuration/UserConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs
@@ -57,6 +57,8 @@ namespace MediaBrowser.Model.Configuration
 
         public UnratedItem[] BlockUnratedItems { get; set; }
 
+        public bool DisplayMovieFormatRibbons { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
index 25b9c687c..68e9e0c78 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 a3a878537..e9aebb6d2 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -760,7 +760,9 @@ namespace MediaBrowser.ServerApplication
 #if DEBUG
                 return false;
 #endif
+#pragma warning disable 162
                 return NativeApp.CanSelfUpdate;
+#pragma warning restore 162
             }
         }
 
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 85f7b8dea..e5127a07a 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -518,6 +518,9 @@ namespace MediaBrowser.WebDashboard.Api
                                       "logpage.js",
                                       "medialibrarypage.js",
                                       "mediaplayer.js",
+
+                                      "mediaplayer-video.js",
+
                                       "metadataconfigurationpage.js",
                                       "metadataimagespage.js",
                                       "moviegenres.js",
diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 02cf62c5b..90a8cedd3 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -201,6 +201,8 @@
     <Content Include="dashboard-ui\css\images\items\list\remotesearch.png">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\css\images\media\pause.png" />

+    <Content Include="dashboard-ui\css\images\media\play.png" />

     <Content Include="dashboard-ui\css\images\media\tvflyout.png">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

@@ -549,6 +551,9 @@
     <Content Include="dashboard-ui\scripts\editorsidebar.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

+    <Content Include="dashboard-ui\scripts\mediaplayer-video.js">

+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

+    </Content>

     <Content Include="dashboard-ui\scripts\movieslatest.js">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>