Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-21 21:20:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1447 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-02-12 13:32:42 -05:00
parent f1f0a5183e a17f7d89f7
commit 2332402841
7 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
View file

@ -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>

1
MediaBrowser.Model/Dto/BaseItemDto.cs
View file

@ -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.

7
MediaBrowser.Model/Querying/ItemFields.cs
View file

@ -253,6 +253,11 @@
/// <summary>
/// The season user data
/// </summary>
SeasonUserData
SeasonUserData,
/// <summary>
/// The service name
/// </summary>
ServiceName
}
}

2
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View file

@ -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;

2
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View file

@ -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)
{

2
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View file

@ -147,7 +147,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
private bool EncodeVideo(MediaSourceInfo mediaSource)
{
var mediaStreams = mediaSource.MediaStreams ?? new List<MediaStream>();
return !mediaStreams.Any(i => i.Type == MediaStreamType.Video && string.Equals(i.Codec, "h264", StringComparison.OrdinalIgnoreCase));
return !mediaStreams.Any(i => i.Type == MediaStreamType.Video && string.Equals(i.Codec, "h264", StringComparison.OrdinalIgnoreCase) && !i.IsInterlaced);
}
protected string GetOutputSizeParam()

13
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View file

@ -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)