alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-02 20:32:52 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

added logging during app update, and IsHD

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-29 20:51:04 -04:00
parent cdfb009df8
commit 02ebeb0e5b
17 changed files with 60 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
View File

@@ -229,7 +229,7 @@ namespace MediaBrowser.Api.DefaultTheme
var movies = items.OfType<Movie>()
.ToList();
var hdMovies = movies.Where(i => i.IsHd).ToList();
var hdMovies = movies.Where(i => i.IsHD).ToList();
var familyGenres = request.FamilyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);

19
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -5,6 +5,7 @@ using MediaBrowser.Common.MediaInfo;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Audio;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.MediaInfo;
using MediaBrowser.Model.Drawing;
@@ -442,7 +443,23 @@ namespace MediaBrowser.Api.Playback
/// <returns>System.String.</returns>
protected string GetProbeSizeArgument(BaseItem item)
{
return MediaEncoder.GetProbeSizeArgument(MediaEncoderHelpers.GetInputType(item));
var type = InputType.AudioFile;
if (item is Audio)
{
type = MediaEncoderHelpers.GetInputType(item.Path, null, null);
}
else
{
var video = item as Video;
if (video != null)
{
type = MediaEncoderHelpers.GetInputType(item.Path, video.VideoType, video.IsoType);
}
}
return MediaEncoder.GetProbeSizeArgument(type);
}
/// <summary>

2
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@@ -756,7 +756,7 @@ namespace MediaBrowser.Api.UserLibrary
if (request.IsHD.HasValue)
{
items = items.OfType<Video>().Where(i => i.IsHd == request.IsHD.Value);
items = items.OfType<Video>().Where(i => i.IsHD == request.IsHD.Value);
}
if (request.ParentIndexNumber.HasValue)