Merge remote-tracking branch 'upstream/master' into plugin-install

1 files changed, 6 insertions, 2 deletions

diff --git a/MediaBrowser.Controller/Devices/IDeviceManager.cs b/MediaBrowser.Controller/Devices/IDeviceManager.cs
index 7d279230b..8f0872dba 100644
--- a/MediaBrowser.Controller/Devices/IDeviceManager.cs
+++ b/MediaBrowser.Controller/Devices/IDeviceManager.cs
@@ -1,7 +1,9 @@
+#pragma warning disable CS1591
+
 using System;
 using Jellyfin.Data.Entities;
+using Jellyfin.Data.Events;
 using MediaBrowser.Model.Devices;
-using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Session;
 
@@ -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;
     }
 }