alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-27 10:58:44 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

xbox one dlna fixes

Browse Source
This commit is contained in:
Luke Pulverenti
2015-04-16 10:59:39 -04:00
parent c7b95a2513
commit 6bd18c6e72
21 changed files with 338 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
View File

@@ -94,7 +94,7 @@ namespace MediaBrowser.Server.Implementations.Photos
protected abstract Task<List<BaseItem>> GetItemsWithImages(IHasImages item);
private const string Version = "29";
private const string Version = "31";
protected string GetConfigurationCacheKey(List<BaseItem> items, string itemName)
{
var parts = Version + "_" + (itemName ?? string.Empty) + "_" +
@@ -103,9 +103,9 @@ namespace MediaBrowser.Server.Implementations.Photos
return parts.GetMD5().ToString("N");
}
protected void CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath)
protected void CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, bool drawText)
{
CreateCollage(primaryItem, items, outputPath, 960, 540, true, primaryItem.Name);
CreateCollage(primaryItem, items, outputPath, 960, 540, drawText, primaryItem.Name);
}
protected virtual IEnumerable<string> GetStripCollageImagePaths(IHasImages primaryItem, IEnumerable<BaseItem> items)
@@ -120,9 +120,9 @@ namespace MediaBrowser.Server.Implementations.Photos
CreateCollage(primaryItem, items, outputPath, 600, 900, true, primaryItem.Name);
}
protected void CreateSquareCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath)
protected void CreateSquareCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, bool drawText)
{
CreateCollage(primaryItem, items, outputPath, 800, 800, true, primaryItem.Name);
CreateCollage(primaryItem, items, outputPath, 800, 800, drawText, primaryItem.Name);
}
protected void CreateThumbCollage(IHasImages primaryItem, List<BaseItem> items, string outputPath, int width, int height, bool drawText, string text)
@@ -162,17 +162,23 @@ namespace MediaBrowser.Server.Implementations.Photos
return false;
}
var drawText = !(item is UserView);
if (imageType == ImageType.Thumb)
{
CreateThumbCollage(item, itemsWithImages, outputPath);
CreateThumbCollage(item, itemsWithImages, outputPath, drawText);
return true;
}
if (imageType == ImageType.Primary)
{
if (item is PhotoAlbum || item is Playlist)
if (item is UserView)
{
CreateSquareCollage(item, itemsWithImages, outputPath);
CreateSquareCollage(item, itemsWithImages, outputPath, drawText);
}
else if (item is PhotoAlbum || item is Playlist)
{
CreateSquareCollage(item, itemsWithImages, outputPath, drawText);
}
else
{