diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-28 00:42:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 00:42:25 -0500 |
| commit | f92e245dfffbc3fdf020a7fcc71faf10a9b7e305 (patch) | |
| tree | 726f0145b9fcda6c671440f2261e0222359090fd /Emby.Server.Implementations/LiveTv | |
| parent | 79eabe1e5888c6866c946276a367ee5c25620763 (diff) | |
| parent | 56b24da15165ef4c4b7107b673bab5b191d76afe (diff) | |
Merge pull request #2315 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs index 45158b3c2..557fa1f5f 100644 --- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs +++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs @@ -141,7 +141,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings ProductionYear = !p.CopyrightDate.HasValue ? (int?)null : p.CopyrightDate.Value.Year, SeasonNumber = p.Episode == null ? null : p.Episode.Series, IsSeries = p.Episode != null, - IsRepeat = p.IsRepeat, + IsRepeat = p.IsPreviouslyShown && !p.IsNew, IsPremiere = p.Premiere != null, IsKids = p.Categories.Any(c => info.KidsCategories.Contains(c, StringComparer.OrdinalIgnoreCase)), IsMovie = p.Categories.Any(c => info.MovieCategories.Contains(c, StringComparer.OrdinalIgnoreCase)), diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs index 64cbc4f86..e4e0519de 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs @@ -100,18 +100,6 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts extInf = extInf.Trim(); - //Check for channel number with the format from SatIp - //int number; - //var numberIndex = channel.Name.IndexOf('.'); - //if (numberIndex > 0) - //{ - // if (int.TryParse(channel.Name.Substring(0, numberIndex), out number)) - // { - // channel.Number = number.ToString(); - // channel.Name = channel.Name.Substring(numberIndex + 1); - // } - //} - channel.ImageUrl = FindProperty("tvg-logo", extInf); channel.Name = GetChannelName(extInf); |