From dd715fbcc74b6c69b5bcd68ea974e39df055c057 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 13 Apr 2017 14:57:24 -0400
Subject: use alameda

---
 .../Library/LibraryManager.cs                      | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index dbb0160a5..fc2299907 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -41,6 +41,7 @@ using SortOrder = MediaBrowser.Model.Entities.SortOrder;
 using VideoResolver = MediaBrowser.Naming.Video.VideoResolver;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.IO;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Model.Tasks;
 
 namespace Emby.Server.Implementations.Library
@@ -375,11 +376,22 @@ namespace Emby.Server.Implementations.Library
                 throw new ArgumentNullException("item");
             }
 
-            _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}",
-                item.GetType().Name,
-                item.Name ?? "Unknown name",
-                item.Path ?? string.Empty,
-                item.Id);
+            if (item is LiveTvProgram)
+            {
+                _logger.Debug("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}",
+                    item.GetType().Name,
+                    item.Name ?? "Unknown name",
+                    item.Path ?? string.Empty,
+                    item.Id);
+            }
+            else
+            {
+                _logger.Info("Deleting item, Type: {0}, Name: {1}, Path: {2}, Id: {3}",
+                    item.GetType().Name,
+                    item.Name ?? "Unknown name",
+                    item.Path ?? string.Empty,
+                    item.Id);
+            }
 
             var parent = item.Parent;
 
-- 
cgit v1.2.3


From 7ea3719a2dfbdbe18a6b83ea5532f061c238cbc4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 20 Apr 2017 16:17:52 -0400
Subject: 3.2.12.11

---
 Emby.Server.Implementations/Library/LibraryManager.cs   |  2 +-
 Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs  |  4 ----
 Emby.Server.Implementations/LiveTv/LiveTvManager.cs     |  1 -
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 ----------
 MediaBrowser.Model/Entities/MediaStream.cs              |  7 -------
 SharedVersion.cs                                        |  2 +-
 6 files changed, 2 insertions(+), 24 deletions(-)

(limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index fc2299907..16a73f392 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2577,7 +2577,7 @@ namespace Emby.Server.Implementations.Library
                 }).OrderBy(i => i.Path).ToList();
         }
 
-        private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes" };
+        private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes", "interviews" };
 
         public IEnumerable<Video> FindExtras(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
         {
diff --git a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
index 4efef4470..925dec71c 100644
--- a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
@@ -30,8 +30,6 @@ namespace Emby.Server.Implementations.LiveTv
 
             var now = DateTime.UtcNow;
 
-            var allowVideoStreamCopy = mediaSource.MediaStreams.Any(i => i.Type == MediaStreamType.Video && i.AllowStreamCopy);
-
             var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest
             {
                 InputPath = mediaSource.Path,
@@ -76,8 +74,6 @@ namespace Emby.Server.Implementations.LiveTv
             var videoStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaBrowser.Model.Entities.MediaStreamType.Video);
             if (videoStream != null)
             {
-                videoStream.AllowStreamCopy = allowVideoStreamCopy;
-
                 if (!videoStream.BitRate.HasValue)
                 {
                     var width = videoStream.Width ?? 1920;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index eee4a2725..a898d3084 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -490,7 +490,6 @@ namespace Emby.Server.Implementations.LiveTv
                     if (stream.Type == MediaStreamType.Video)
                     {
                         stream.IsInterlaced = true;
-                        stream.AllowStreamCopy = false;
                     }
                 }
             }
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index dd1397a0d..22d09f34a 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -747,11 +747,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool CanStreamCopyVideo(EncodingJobInfo state, MediaStream videoStream)
         {
-            if (!videoStream.AllowStreamCopy)
-            {
-                return false;
-            }
-
             var request = state.BaseRequest;
 
             if (!request.AllowVideoStreamCopy)
@@ -897,11 +892,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public bool CanStreamCopyAudio(EncodingJobInfo state, MediaStream audioStream, List<string> supportedAudioCodecs)
         {
-            if (!audioStream.AllowStreamCopy)
-            {
-                return false;
-            }
-
             var request = state.BaseRequest;
 
             if (!request.AllowAudioStreamCopy)
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 133b9e566..3cd3e7dde 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -13,11 +13,6 @@ namespace MediaBrowser.Model.Entities
     [DebuggerDisplay("StreamType = {Type}")]
     public class MediaStream
     {
-        public MediaStream()
-        {
-            AllowStreamCopy = true;
-        }
-
         /// <summary>
         /// Gets or sets the codec.
         /// </summary>
@@ -158,8 +153,6 @@ namespace MediaBrowser.Model.Entities
 
         public bool? IsAVC { get; set; }
 
-        public bool AllowStreamCopy { get; set; }
-
         /// <summary>
         /// Gets or sets the channel layout.
         /// </summary>
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 2e6e90c59..ab54dc780 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.12.10")]
+[assembly: AssemblyVersion("3.2.12.11")]
-- 
cgit v1.2.3