michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

update merge

Browse Source
This commit is contained in:
Luke Pulverenti 2015-09-20 13:28:32 -04:00
parent 543cf723ef
commit 25c37e40ad
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Common/ScheduledTasks/IntervalTrigger.cs
View File

@ -104,4 +104,4 @@ namespace MediaBrowser.Common.ScheduledTasks
}
}
}
}
}

30
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -157,7 +157,7 @@ namespace MediaBrowser.Model.Dlna
if (all)
{
if (item.Protocol == MediaProtocol.File &&
directPlayMethods.Contains(PlayMethod.DirectPlay) &&
directPlayMethods.Contains(PlayMethod.DirectPlay) &&
_localPlayer.CanAccessFile(item.Path))
{
playlistItem.PlayMethod = PlayMethod.DirectPlay;
@ -288,7 +288,7 @@ namespace MediaBrowser.Model.Dlna
{
_logger.Debug("Profile: {0}, No direct play profiles found for Path: {1}",
options.Profile.Name ?? "Unknown Profile",
item.Path ?? "Unknown path");
item.Path ?? "Unknown path");
}
return playMethods;
@ -306,7 +306,7 @@ namespace MediaBrowser.Model.Dlna
{
highestScore = stream.Score.Value;
}
}
}
}
List<MediaStream> topStreams = new List<MediaStream>();
@ -540,8 +540,8 @@ namespace MediaBrowser.Model.Dlna
{
_logger.Debug("Profile: {0}, No direct play profiles found for Path: {1}",
profile.Name ?? "Unknown Profile",
mediaSource.Path ?? "Unknown path");
mediaSource.Path ?? "Unknown path");
return null;
}
@ -658,7 +658,7 @@ namespace MediaBrowser.Model.Dlna
if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioProfile, isSecondaryAudio))
{
LogConditionFailure(profile, "VideoAudioCodecProfile", i, mediaSource);
return null;
}
}
@ -725,7 +725,7 @@ namespace MediaBrowser.Model.Dlna
public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, EncodingContext context, PlayMethod playMethod)
{
if (playMethod != PlayMethod.Transcode && !subtitleStream.IsExternal)
if (playMethod != PlayMethod.Transcode && !subtitleStream.IsExternal)
{
// Look for supported embedded subs
foreach (SubtitleProfile profile in subtitleProfiles)
@ -749,11 +749,11 @@ namespace MediaBrowser.Model.Dlna
// Look for an external profile that matches the stream type (text/graphical)
foreach (SubtitleProfile profile in subtitleProfiles)
{
if (profile.Method != SubtitleDeliveryMethod.External)
{
continue;
}
{
if (profile.Method != SubtitleDeliveryMethod.External)
{
continue;
}
if (!profile.SupportsLanguage(subtitleStream.Language))
{
@ -762,9 +762,9 @@ namespace MediaBrowser.Model.Dlna
if (subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{
bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format);
if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
{
if (subtitleStream.SupportsExternalStream)
{
@ -1042,4 +1042,4 @@ namespace MediaBrowser.Model.Dlna
return true;
}
}
}
}

2
MediaBrowser.Model/Net/MimeTypes.cs
View File

@ -321,4 +321,4 @@ namespace MediaBrowser.Model.Net
return null;
}
}
}
}

4
MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
View File

@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
}
else if (IsIgnored(child.Name))
{
}
else
{
@ -515,4 +515,4 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
return !validCollectionTypes.Contains(collectionType ?? string.Empty, StringComparer.OrdinalIgnoreCase);
}
}
}
}