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

update live tv grid style

Browse source
This commit is contained in:
Luke Pulverenti 2015-04-14 15:11:29 -04:00
parent 760f298dcc
commit 639d8d360f
3 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
MediaBrowser.Model/Dlna/StreamBuilder.cs
View file

@ -564,10 +564,7 @@ namespace MediaBrowser.Model.Dlna
{
if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams))
{
_logger.Debug("Profile: {0}, DirectPlay=false. Reason=VideoContainerProfile.{1} Path: {2}",
profile.Name ?? "Unknown Profile",
i.Property,
mediaSource.Path ?? "Unknown path");
LogConditionFailure(profile, "VideoContainerProfile", i, mediaSource);
return null;
}
@ -600,10 +597,7 @@ namespace MediaBrowser.Model.Dlna
{
if (!conditionProcessor.IsVideoConditionSatisfied(i, audioBitrate, audioChannels, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, isCabac, refFrames, numVideoStreams, numAudioStreams))
{
_logger.Debug("Profile: {0}, DirectPlay=false. Reason=VideoCodecProfile.{1} Path: {2}",
profile.Name ?? "Unknown Profile",
i.Property,
mediaSource.Path ?? "Unknown path");
LogConditionFailure(profile, "VideoCodecProfile", i, mediaSource);
return null;
}
@ -639,10 +633,7 @@ namespace MediaBrowser.Model.Dlna
bool? isSecondaryAudio = audioStream == null ? null : mediaSource.IsSecondaryAudio(audioStream);
if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioProfile, isSecondaryAudio))
{
_logger.Debug("Profile: {0}, DirectPlay=false. Reason=VideoAudioCodecProfile.{1} Path: {2}",
profile.Name ?? "Unknown Profile",
i.Property,
mediaSource.Path ?? "Unknown path");
LogConditionFailure(profile, "VideoAudioCodecProfile", i, mediaSource);
return null;
}
@ -679,6 +670,18 @@ namespace MediaBrowser.Model.Dlna
return null;
}
private void LogConditionFailure(DeviceProfile profile, string type, ProfileCondition condition, MediaSourceInfo mediaSource)
{
_logger.Debug("Profile: {0}, DirectPlay=false. Reason={1}.{2} Condition: {3}. ConditionValue: {4}. IsRequired: {5}. Path: {6}",
type,
profile.Name ?? "Unknown Profile",
condition.Property,
condition.Condition,
condition.Value ?? string.Empty,
condition.IsRequired,
mediaSource.Path ?? "Unknown path");
}
private bool IsEligibleForDirectPlay(MediaSourceInfo item,
int? maxBitrate,
MediaStream subtitleStream,

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

@ -1007,12 +1007,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
innerProgress.RegisterAction(p => progress.Report(90 + (p * .1)));
await CleanDatabaseInternal(progress, cancellationToken).ConfigureAwait(false);
foreach (var program in _programs.Values
.Where(i => (i.StartDate - DateTime.UtcNow).TotalDays <= 1)
.ToList())
{
RefreshIfNeeded(program);
}
RefreshIfNeeded(_programs.Values.Where(i => (i.StartDate - DateTime.UtcNow).TotalDays <= 1).ToList());
}
finally
{
@ -1145,8 +1140,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv
_refreshedPrograms.Clear();
progress.Report(90);
RefreshIfNeeded(programs.Take(500));
// Load these now which will prefetch metadata
var dtoOptions = new DtoOptions();
dtoOptions.Fields.Remove(ItemFields.SyncInfo);

4
MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs
View file

@ -206,7 +206,7 @@ namespace MediaBrowser.Server.Implementations.Sync
Condition = ProfileConditionType.LessThanEqual,
Property = ProfileConditionValue.AudioChannels,
Value = "5",
IsRequired = true
IsRequired = false
},
new ProfileCondition
{
@ -220,7 +220,7 @@ namespace MediaBrowser.Server.Implementations.Sync
codecProfiles.Add(new CodecProfile
{
Type = CodecType.VideoAudio,
Codec = "ac3",
Codec = "aac,mp3",
Conditions = new[]
{
new ProfileCondition