alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-28 03:18:27 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' into event-rewrite-1

Browse Source 
# Conflicts:
#	Emby.Dlna/Emby.Dlna.csproj
#	Emby.Dlna/Eventing/DlnaEventManager.cs
#	Emby.Dlna/Service/BaseService.cs
#	Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
#	MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs
This commit is contained in:
Patrick Barron
2020-08-24 20:04:13 -04:00
parent 98ed90c4a2 ec3104d2d2
commit 9fa4fff15d
408 changed files with 2671 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Providers/IProviderManager.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
using System.Collections.Generic;
using System.IO;
@@ -72,7 +74,7 @@ namespace MediaBrowser.Controller.Providers
/// <returns>Task.</returns>
Task SaveImage(BaseItem item, string source, string mimeType, ImageType type, int? imageIndex, bool? saveLocallyWithMedia, CancellationToken cancellationToken);
Task SaveImage(User user, Stream source, string mimeType, string path);
Task SaveImage(Stream source, string mimeType, string path);
/// <summary>
/// Adds the metadata providers.