lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2146 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-09-08 17:30:47 -04:00 committed by GitHub
commit 25af408c85
6 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/LiveTv/ProgramInfo.cs
View File

@ -1,6 +1,7 @@
using MediaBrowser.Model.LiveTv; using MediaBrowser.Model.LiveTv;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.LiveTv namespace MediaBrowser.Controller.LiveTv
{ {
@ -66,6 +67,8 @@ namespace MediaBrowser.Controller.LiveTv
/// <value><c>true</c> if this instance is hd; otherwise, <c>false</c>.</value> /// <value><c>true</c> if this instance is hd; otherwise, <c>false</c>.</value>
public bool? IsHD { get; set; } public bool? IsHD { get; set; }
public bool? Is3D { get; set; }
/// <summary> /// <summary>
/// Gets or sets the audio. /// Gets or sets the audio.
/// </summary> /// </summary>
@ -84,6 +87,8 @@ namespace MediaBrowser.Controller.LiveTv
/// <value><c>true</c> if this instance is repeat; otherwise, <c>false</c>.</value> /// <value><c>true</c> if this instance is repeat; otherwise, <c>false</c>.</value>
public bool IsRepeat { get; set; } public bool IsRepeat { get; set; }
public bool IsSubjectToBlackout { get; set; }
/// <summary> /// <summary>
/// Gets or sets the episode title. /// Gets or sets the episode title.
/// </summary> /// </summary>
@ -144,6 +149,8 @@ namespace MediaBrowser.Controller.LiveTv
/// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value> /// <value><c>true</c> if this instance is kids; otherwise, <c>false</c>.</value>
public bool IsKids { get; set; } public bool IsKids { get; set; }
public bool IsEducational { get; set; }
/// <summary> /// <summary>
/// Gets or sets a value indicating whether this instance is premiere. /// Gets or sets a value indicating whether this instance is premiere.
/// </summary> /// </summary>

1
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -234,6 +234,7 @@ namespace MediaBrowser.Model.Configuration
EnableAnonymousUsageReporting = true; EnableAnonymousUsageReporting = true;
EnableAutomaticRestart = true; EnableAutomaticRestart = true;
EnableFolderView = true;
EnableUPnP = true; EnableUPnP = true;
SharingExpirationDays = 30; SharingExpirationDays = 30;

3
MediaBrowser.Model/LiveTv/ProgramAudio.cs
View File

@ -6,6 +6,7 @@
Stereo, Stereo,
Dolby, Dolby,
DolbyDigital, DolbyDigital,
Thx Thx,
Atmos
} }
} }

2
MediaBrowser.Server.Implementations/Connect/ConnectEntryPoint.cs
View File

@ -43,7 +43,7 @@ namespace MediaBrowser.Server.Implementations.Connect
{ {
LoadCachedAddress(); LoadCachedAddress();
_timer = new PeriodicTimer(TimerCallback, null, TimeSpan.FromSeconds(5), TimeSpan.FromHours(3)); _timer = new PeriodicTimer(TimerCallback, null, TimeSpan.FromSeconds(5), TimeSpan.FromHours(1));
((ConnectManager)_connectManager).Start(); ((ConnectManager)_connectManager).Start();
} }

7
MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -348,7 +348,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
if (programInfo.audioProperties != null) if (programInfo.audioProperties != null)
{ {
if (programInfo.audioProperties.Exists(item => string.Equals(item, "dd 5.1", StringComparison.OrdinalIgnoreCase))) if (programInfo.audioProperties.Exists(item => string.Equals(item, "atmos", StringComparison.OrdinalIgnoreCase)))
{
audioType = ProgramAudio.Atmos;
}
else if (programInfo.audioProperties.Exists(item => string.Equals(item, "dd 5.1", StringComparison.OrdinalIgnoreCase)))
{ {
audioType = ProgramAudio.DolbyDigital; audioType = ProgramAudio.DolbyDigital;
} }
@ -405,6 +409,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
if (programInfo.videoProperties != null) if (programInfo.videoProperties != null)
{ {
info.IsHD = programInfo.videoProperties.Contains("hdtv", StringComparer.OrdinalIgnoreCase); info.IsHD = programInfo.videoProperties.Contains("hdtv", StringComparer.OrdinalIgnoreCase);
info.Is3D = programInfo.videoProperties.Contains("3d", StringComparer.OrdinalIgnoreCase);
} }
if (details.contentRating != null && details.contentRating.Count > 0) if (details.contentRating != null && details.contentRating.Count > 0)

17
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@ -2803,15 +2803,18 @@ namespace MediaBrowser.Server.Implementations.LiveTv
feature = "embytvseriesrecordings"; feature = "embytvseriesrecordings";
} }
var config = GetConfiguration(); if (string.Equals(feature, "dvr", StringComparison.OrdinalIgnoreCase))
if (config.TunerHosts.Count(i => i.IsEnabled) > 0 &&
config.ListingProviders.Count(i => (i.EnableAllTuners || i.EnabledTuners.Length > 0) && string.Equals(i.Type, SchedulesDirect.TypeName, StringComparison.OrdinalIgnoreCase)) > 0)
{ {
return Task.FromResult(new MBRegistrationRecord var config = GetConfiguration();
if (config.TunerHosts.Count(i => i.IsEnabled) > 0 &&
config.ListingProviders.Count(i => (i.EnableAllTuners || i.EnabledTuners.Length > 0) && string.Equals(i.Type, SchedulesDirect.TypeName, StringComparison.OrdinalIgnoreCase)) > 0)
{ {
IsRegistered = true, return Task.FromResult(new MBRegistrationRecord
IsValid = true {
}); IsRegistered = true,
IsValid = true
});
}
} }
return _security.GetRegistrationStatus(feature); return _security.GetRegistrationStatus(feature);