Merge pull request #2951 from MediaBrowser/dev

Dev

2 files changed, 11 insertions, 24 deletions

diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index ec2704aa08..718620ab57 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -527,18 +527,18 @@ namespace Emby.Server.Implementations.LiveTv
 
             item.ChannelType = channelInfo.ChannelType;
             item.ServiceName = serviceName;
+
+            if (!string.Equals(channelInfo.Number, item.Number, StringComparison.Ordinal))
+            {
+                forceUpdate = true;
+            }
             item.Number = channelInfo.Number;
 
-            //if (!string.Equals(item.ProviderImageUrl, channelInfo.ImageUrl, StringComparison.OrdinalIgnoreCase))
-            //{
-            //    isNew = true;
-            //    replaceImages.Add(ImageType.Primary);
-            //}
-            //if (!string.Equals(item.ProviderImagePath, channelInfo.ImagePath, StringComparison.OrdinalIgnoreCase))
-            //{
-            //    isNew = true;
-            //    replaceImages.Add(ImageType.Primary);
-            //}
+            if (!string.Equals(channelInfo.Name, item.Name, StringComparison.Ordinal))
+            {
+                forceUpdate = true;
+            }
+            item.Name = channelInfo.Name;
 
             if (!item.HasImage(ImageType.Primary))
             {
@@ -554,11 +554,6 @@ namespace Emby.Server.Implementations.LiveTv
                 }
             }
 
-            if (string.IsNullOrEmpty(item.Name))
-            {
-                item.Name = channelInfo.Name;
-            }
-
             if (isNew)
             {
                 _libraryManager.CreateItem(item, cancellationToken);
@@ -2923,7 +2918,7 @@ namespace Emby.Server.Implementations.LiveTv
 
         public Folder GetInternalLiveTvFolder(CancellationToken cancellationToken)
         {
-            var name = _localization.GetLocalizedString("ViewTypeLiveTV");
+            var name = _localization.GetLocalizedString("HeaderLiveTV");
             return _libraryManager.GetNamedView(name, CollectionType.LiveTv, name, cancellationToken);
         }
 
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
index 8d1854f4b2..9fc6687d14 100644
--- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
+++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
@@ -93,13 +93,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
 
         protected override async Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo info, string channelId, CancellationToken cancellationToken)
         {
-            var channelIdPrefix = GetFullChannelIdPrefix(info);
-
-            if (!channelId.StartsWith(channelIdPrefix, StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-
             var channels = await GetChannels(info, true, cancellationToken).ConfigureAwait(false);
             var channel = channels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
             if (channel != null)
@@ -165,7 +158,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
                 RequiresOpening = true,
                 RequiresClosing = true,
                 RequiresLooping = info.EnableStreamLooping,
-                EnableMpDecimate = info.EnableMpDecimate,
 
                 ReadAtNativeFramerate = false,