Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 13 insertions, 6 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index 4e1bd860b..cf7358cce 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -222,13 +222,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 RunTimeTicks = (info.EndDate - info.StartDate).Ticks,
                 OriginalAirDate = info.OriginalAirDate,
 
-                MediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery
-                {
-                    ItemId = recording.Id
-
-                }).ToList()
+                MediaSources = _dtoService.GetMediaSources((BaseItem)recording)
             };
 
+            dto.MediaStreams = dto.MediaSources.SelectMany(i => i.MediaStreams).ToList();
+
             if (info.Status == RecordingStatus.InProgress)
             {
                 var now = DateTime.UtcNow.Ticks;
@@ -317,7 +315,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 Type = info.GetClientTypeName(),
                 Id = info.Id.ToString("N"),
                 MediaType = info.MediaType,
-                ExternalId = info.ExternalId
+                ExternalId = info.ExternalId,
+                MediaSources = _dtoService.GetMediaSources(info)
             };
 
             if (user != null)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index db8786d62..b828dc0de 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -134,6 +134,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                         return number;
 
                     });
+
+                if (query.IsFavorite.HasValue)
+                {
+                    var val = query.IsFavorite.Value;
+
+                    channels = channels
+                        .Where(i => _userDataManager.GetUserData(user.Id, i.GetUserDataKey()).IsFavorite == val);
+                }
             }
 
             channels = channels.OrderBy(i =>