From 9f0e6d17c8653328316cde3a1b0b3ce63b5960ff Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 12 Jun 2017 03:11:54 -0400 Subject: add hevc cuvid --- MediaBrowser.Controller/Entities/Folder.cs | 27 ------------------------- MediaBrowser.Controller/Entities/TV/Season.cs | 11 ---------- MediaBrowser.Controller/Entities/TV/Series.cs | 11 ---------- MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 7 ++++++- 4 files changed, 6 insertions(+), 50 deletions(-) (limited to 'MediaBrowser.Controller') diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 48c9b83aa2..727b7dbebe 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -211,33 +211,6 @@ namespace MediaBrowser.Controller.Entities item.SetParent(null); } - /// - /// Returns the valid set of index by options for this folder type. - /// Override or extend to modify. - /// - /// Dictionary{System.StringFunc{UserIEnumerable{BaseItem}}}. - protected virtual IEnumerable GetIndexByOptions() - { - return new List { - {"None"}, - {"Performer"}, - {"Genre"}, - {"Director"}, - {"Year"}, - {"Studio"} - }; - } - - /// - /// Get the list of indexy by choices for this folder (localized). - /// - /// The index by option strings. - [IgnoreDataMember] - public IEnumerable IndexByOptionStrings - { - get { return GetIndexByOptions(); } - } - /// /// Gets the actual children. /// diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs index 17494eb087..b681fdcb10 100644 --- a/MediaBrowser.Controller/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -66,17 +66,6 @@ namespace MediaBrowser.Controller.Entities.TV return series == null ? SeriesName : series.SortName; } - // Genre, Rating and Stuido will all be the same - protected override IEnumerable GetIndexByOptions() - { - return new List { - {"None"}, - {"Performer"}, - {"Director"}, - {"Year"}, - }; - } - public override List GetUserDataKeys() { var list = base.GetUserDataKeys(); diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs index c54f93f11f..0b96624505 100644 --- a/MediaBrowser.Controller/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -227,17 +227,6 @@ namespace MediaBrowser.Controller.Entities.TV return list; } - // Studio, Genre and Rating will all be the same so makes no sense to index by these - protected override IEnumerable GetIndexByOptions() - { - return new List { - {"None"}, - {"Performer"}, - {"Director"}, - {"Year"}, - }; - } - [IgnoreDataMember] public bool ContainsEpisodesWithoutSeasonFolders { diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 665640dfd1..87fc581307 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -57,8 +57,13 @@ namespace MediaBrowser.Controller.LiveTv return value; } + else + { + double value = 2; + value /= 3; - return null; + return value; + } } [IgnoreDataMember] -- cgit v1.2.3