diff options
6 files changed, 22 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs index 3d9354433..05c7448c3 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs @@ -345,9 +345,9 @@ namespace MediaBrowser.Controller.LiveTv /// </summary> /// <param name="item">The item.</param> /// <param name="dto">The dto.</param> - /// <param name="addChannelInfo">if set to <c>true</c> [add channel information].</param> + /// <param name="fields">The fields.</param> /// <param name="user">The user.</param> - void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, bool addChannelInfo, User user = null); + void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, List<ItemFields> fields, User user = null); /// <summary> /// Saves the tuner host. /// </summary> diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs index 935d280cd..ef2de5d78 100644 --- a/MediaBrowser.Model/Dto/BaseItemDto.cs +++ b/MediaBrowser.Model/Dto/BaseItemDto.cs @@ -192,6 +192,7 @@ namespace MediaBrowser.Model.Dto /// <value>The channel identifier.</value> public string ChannelId { get; set; } public string ChannelName { get; set; } + public string ServiceName { get; set; } /// <summary> /// Gets or sets the overview. diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs index e8b1414b7..97fec8fdd 100644 --- a/MediaBrowser.Model/Querying/ItemFields.cs +++ b/MediaBrowser.Model/Querying/ItemFields.cs @@ -253,6 +253,11 @@ /// <summary> /// The season user data /// </summary> - SeasonUserData + SeasonUserData, + + /// <summary> + /// The service name + /// </summary> + ServiceName } } diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 89f572a54..590c5fd3f 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 5d7bb7c28..9e4cb66a8 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 b21e439a6..85b2059ae 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) |