From 5e2da20ddacb8e3179bfcaa996e45cffefb7deb5 Mon Sep 17 00:00:00 2001
From: Tim Hobbs <jesus.tesh@gmail.com>
Date: Sat, 8 Mar 2014 00:09:45 -0800
Subject: [PATCH 1/5] Major video player overhaul

Updates, enhancements and some bug fixes too.
---
 MediaBrowser.WebDashboard/Api/DashboardService.cs          | 3 +++
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index c10b17d678..b163c7748e 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -516,6 +516,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 4895d203f5..1b1abec120 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>
@@ -534,6 +536,7 @@
     <Content Include="dashboard-ui\scripts\editorsidebar.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="dashboard-ui\scripts\mediaplayer-video.js" />
     <Content Include="dashboard-ui\scripts\musicalbumartists.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

From d50455e0465240b6b050a95703856c820c2769fe Mon Sep 17 00:00:00 2001
From: Tim Hobbs <jesus.tesh@gmail.com>
Date: Mon, 10 Mar 2014 22:49:37 +0000
Subject: [PATCH 2/5] Forgot to set "copy if newer"

---
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 1b1abec120..2fc2407e0a 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -536,7 +536,9 @@
     <Content Include="dashboard-ui\scripts\editorsidebar.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="dashboard-ui\scripts\mediaplayer-video.js" />
+    <Content Include="dashboard-ui\scripts\mediaplayer-video.js">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="dashboard-ui\scripts\musicalbumartists.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

From dd4a1ff4b50f58c27af223202454f80d45de4af1 Mon Sep 17 00:00:00 2001
From: Tim Hobbs <jesus.tesh@gmail.com>
Date: Tue, 11 Mar 2014 00:54:31 +0000
Subject: [PATCH 3/5] Added compiler warning overrides

---
 MediaBrowser.Api/Playback/BaseStreamingService.cs               | 2 ++
 .../MediaEncoder/MediaEncoder.cs                                | 2 ++
 MediaBrowser.ServerApplication/ApplicationHost.cs               | 2 ++
 3 files changed, 6 insertions(+)

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
             }
         }
 

From a402d3ea9232799b136b0dc8e9936ebfb286b7f5 Mon Sep 17 00:00:00 2001
From: Tim Hobbs <jesus.tesh@gmail.com>
Date: Thu, 13 Mar 2014 06:17:02 -0700
Subject: [PATCH 4/5] Enable movie format ribbons

Per-user configuration to enable movie format ribbons
---
 MediaBrowser.Model/Configuration/UserConfiguration.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs
index 2145860c73..3df25425d5 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>

From d31fe653ae2fc2f261816c4cb816b23f9ee9ddbc Mon Sep 17 00:00:00 2001
From: Tim Hobbs <jesus.tesh@gmail.com>
Date: Thu, 13 Mar 2014 06:47:30 -0700
Subject: [PATCH 5/5] Fixed csproj

---
 MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
index 0bd54ab8c5..90a8cedd34 100644
--- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
+++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
@@ -552,6 +552,8 @@
       <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>