alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 01:24:44 +01:00
Code Issues Actions 2 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

6
MediaBrowser.Controller/Devices/IDeviceManager.cs
View File

@@ -1,3 +1,5 @@
#pragma warning disable CS1591
using System;
using Jellyfin.Data.Entities;
using Jellyfin.Data.Events;
@@ -9,6 +11,8 @@ namespace MediaBrowser.Controller.Devices
{
public interface IDeviceManager
{
event EventHandler<GenericEventArgs<Tuple<string, DeviceOptions>>> DeviceOptionsUpdated;
/// <summary>
/// Saves the capabilities.
/// </summary>
@@ -44,7 +48,7 @@ namespace MediaBrowser.Controller.Devices
bool CanAccessDevice(User user, string deviceId);
void UpdateDeviceOptions(string deviceId, DeviceOptions options);
DeviceOptions GetDeviceOptions(string deviceId);
event EventHandler<GenericEventArgs<Tuple<string, DeviceOptions>>> DeviceOptionsUpdated;
}
}