diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-16 13:44:03 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-12-16 13:44:03 -0500 |
| commit | cb9b570a2a19463c16e4644b60a2916579a7806c (patch) | |
| tree | 0be50708739633a7283c1213bfabbc6fa3ea7214 /MediaBrowser.Server.Implementations | |
| parent | 7e8d11cb2a71370eea35cfa99c5cec21cf15a12e (diff) | |
live tv updates
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs | 22 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 2 |
2 files changed, 16 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index fc030dbf8..a30d1cfbb 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -47,7 +47,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv RequiredPrePaddingSeconds = info.RequiredPrePaddingSeconds, ExternalChannelId = info.ChannelId, ExternalSeriesTimerId = info.SeriesTimerId, - ServiceName = service.Name + ServiceName = service.Name, + ExternalProgramId = info.ProgramId }; var duration = info.EndDate - info.StartDate; @@ -78,7 +79,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv RequiredPrePaddingSeconds = info.RequiredPrePaddingSeconds, Days = info.Days, Priority = info.Priority, - RecurrenceType = info.RecurrenceType, + RecordAnyChannel = info.RecordAnyChannel, + RecordAnyTime = info.RecordAnyTime, + RecordNewOnly = info.RecordNewOnly, ExternalChannelId = info.ChannelId, ExternalProgramId = info.ProgramId, ServiceName = service.Name @@ -146,7 +149,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv OfficialRating = info.OfficialRating, Audio = info.Audio, IsHD = info.IsHD, - ServiceName = service.Name + ServiceName = service.Name, + Url = info.Url }; if (user != null) @@ -219,7 +223,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv CommunityRating = program.CommunityRating, AspectRatio = program.AspectRatio, IsRepeat = program.IsRepeat, - EpisodeTitle = program.EpisodeTitle + EpisodeTitle = program.EpisodeTitle, + ChannelName = program.ChannelName }; if (user != null) @@ -302,7 +307,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv RequestedPostPaddingSeconds = dto.RequestedPostPaddingSeconds, RequestedPrePaddingSeconds = dto.RequestedPrePaddingSeconds, RequiredPostPaddingSeconds = dto.RequiredPostPaddingSeconds, - RequiredPrePaddingSeconds = dto.RequiredPrePaddingSeconds + RequiredPrePaddingSeconds = dto.RequiredPrePaddingSeconds, + ProgramId = dto.ExternalProgramId }; } @@ -323,8 +329,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv RequiredPrePaddingSeconds = dto.RequiredPrePaddingSeconds, Days = dto.Days, Priority = dto.Priority, - RecurrenceType = dto.RecurrenceType, - ProgramId = dto.ExternalProgramId + ProgramId = dto.ExternalProgramId, + RecordAnyChannel = dto.RecordAnyChannel, + RecordAnyTime = dto.RecordAnyTime, + RecordNewOnly = dto.RecordNewOnly }; } } diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index e06b99999..b56f94a36 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -336,7 +336,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv .ToList(); } - var returnArray = list.OrderByDescending(i => i.StartDate) + var returnArray = list.OrderBy(i => i.StartDate) .ToArray(); return new QueryResult<TimerInfoDto> |