diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 3d9354433f..05c7448c36 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -345,9 +345,9 @@ namespace MediaBrowser.Controller.LiveTv
///
/// The item.
/// The dto.
- /// if set to true [add channel information].
+ /// The fields.
/// The user.
- void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, bool addChannelInfo, User user = null);
+ void AddInfoToProgramDto(BaseItem item, BaseItemDto dto, List fields, User user = null);
///
/// Saves the tuner host.
///
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 935d280cd2..ef2de5d789 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -192,6 +192,7 @@ namespace MediaBrowser.Model.Dto
/// The channel identifier.
public string ChannelId { get; set; }
public string ChannelName { get; set; }
+ public string ServiceName { get; set; }
///
/// Gets or sets the overview.
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index e8b1414b79..97fec8fdd3 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -253,6 +253,11 @@
///
/// The season user data
///
- SeasonUserData
+ SeasonUserData,
+
+ ///
+ /// The service name
+ ///
+ ServiceName
}
}
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 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)