diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-30 02:50:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 02:50:55 -0400 |
| commit | f1f566c130aa652776f102dee464571bf035bf1d (patch) | |
| tree | 5d8226b8f7ca5355afd2b6c554a086224f376271 /MediaBrowser.Controller | |
| parent | 3946c60bb0e62ce208e07c7749b8d1b994978b0a (diff) | |
| parent | 6a7fabc3bd4ab8496a90bd04e9decf48bf16edc2 (diff) | |
Merge pull request #2200 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/InternalItemsQuery.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveStream.cs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs index d917b7d6d..5e70cd587 100644 --- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs +++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs @@ -151,6 +151,8 @@ namespace MediaBrowser.Controller.Entities public Dictionary<string, string> ExcludeProviderIds { get; set; } public bool EnableGroupByMetadataKey { get; set; } + public List<Tuple<string, SortOrder>> OrderBy { get; set; } + public InternalItemsQuery() { GroupByPresentationUniqueKey = true; @@ -193,6 +195,7 @@ namespace MediaBrowser.Controller.Entities TrailerTypes = new TrailerType[] { }; AirDays = new DayOfWeek[] { }; SeriesStatuses = new SeriesStatus[] { }; + OrderBy = new List<Tuple<string, SortOrder>>(); } public InternalItemsQuery(User user) diff --git a/MediaBrowser.Controller/LiveTv/LiveStream.cs b/MediaBrowser.Controller/LiveTv/LiveStream.cs index 1bb198632..7d44fbd90 100644 --- a/MediaBrowser.Controller/LiveTv/LiveStream.cs +++ b/MediaBrowser.Controller/LiveTv/LiveStream.cs @@ -13,11 +13,13 @@ namespace MediaBrowser.Controller.LiveTv public int ConsumerCount { get; set; } public ITunerHost TunerHost { get; set; } public string OriginalStreamId { get; set; } + public bool EnableStreamSharing { get; set; } public LiveStream(MediaSourceInfo mediaSource) { OriginalMediaSource = mediaSource; OpenedMediaSource = mediaSource; + EnableStreamSharing = true; } public async Task Open(CancellationToken cancellationToken) |