diff options
| author | Tavares André <tavares_and@hotmail.com> | 2015-05-26 18:31:47 +0200 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2015-05-26 18:31:47 +0200 |
| commit | fb597815483c470b8f5218b4e2324bdf930df7ad (patch) | |
| tree | 291d325783a8d491079479590d467183de175a64 /MediaBrowser.Server.Implementations/Devices | |
| parent | 428dfd183d224b9ec1e85828319399d80e1876e0 (diff) | |
| parent | 217c5fbe749d39554f23c1d9701d7260c1c5b0d0 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/Devices')
| -rw-r--r-- | MediaBrowser.Server.Implementations/Devices/DeviceManager.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs index fb64a6d28..04337dda6 100644 --- a/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs +++ b/MediaBrowser.Server.Implementations/Devices/DeviceManager.cs @@ -1,6 +1,7 @@ using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Events; using MediaBrowser.Common.IO; +using MediaBrowser.Common.Net; using MediaBrowser.Controller.Devices; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Devices; @@ -26,6 +27,7 @@ namespace MediaBrowser.Server.Implementations.Devices private readonly ILibraryMonitor _libraryMonitor; private readonly IConfigurationManager _config; private readonly ILogger _logger; + private readonly INetworkManager _network; public event EventHandler<GenericEventArgs<CameraImageUploadInfo>> CameraImageUploaded; @@ -34,7 +36,7 @@ namespace MediaBrowser.Server.Implementations.Devices /// </summary> public event EventHandler<GenericEventArgs<DeviceInfo>> DeviceOptionsUpdated; - public DeviceManager(IDeviceRepository repo, IUserManager userManager, IFileSystem fileSystem, ILibraryMonitor libraryMonitor, IConfigurationManager config, ILogger logger) + public DeviceManager(IDeviceRepository repo, IUserManager userManager, IFileSystem fileSystem, ILibraryMonitor libraryMonitor, IConfigurationManager config, ILogger logger, INetworkManager network) { _repo = repo; _userManager = userManager; @@ -42,6 +44,7 @@ namespace MediaBrowser.Server.Implementations.Devices _libraryMonitor = libraryMonitor; _config = config; _logger = logger; + _network = network; } public async Task<DeviceInfo> RegisterDevice(string reportedId, string name, string appName, string appVersion, string usedByUserId) |
