diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations')
3 files changed, 13 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 89f572a549..590c5fd3fc 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -395,7 +395,7 @@ namespace MediaBrowser.Server.Implementations.Dto else if (item is LiveTvProgram) { - _livetvManager().AddInfoToProgramDto(item, dto, fields.Contains(ItemFields.ChannelInfo), user); + _livetvManager().AddInfoToProgramDto(item, dto, fields, user); } return dto; diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 5d7bb7c28c..9e4cb66a82 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -845,7 +845,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV { if (GetConfiguration().EnableRecordingEncoding) { - var regInfo = await _security.GetRegistrationStatus("embytvseriesrecordings").ConfigureAwait(false); + var regInfo = await _security.GetRegistrationStatus("embytvrecordingconversion").ConfigureAwait(false); if (regInfo.IsValid) { diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index b21e439a68..85b2059aea 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -1467,7 +1467,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv }; } - public void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, bool addChannelInfo, User user = null) + public void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, List<ItemFields> fields, User user = null) { var program = (LiveTvProgram)item; @@ -1507,7 +1507,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv dto.IsPremiere = program.IsPremiere; } - if (addChannelInfo) + if (fields.Contains(ItemFields.ChannelInfo)) { var channel = GetInternalChannel(program.ChannelId); @@ -1522,6 +1522,15 @@ namespace MediaBrowser.Server.Implementations.LiveTv } } } + + if (fields.Contains(ItemFields.ServiceName)) + { + var service = GetService(program); + if (service != null) + { + dto.ServiceName = service.Name; + } + } } public void AddInfoToRecordingDto(BaseItem item, BaseItemDto dto, User user = null) |