rework upnp discovery

2 files changed, 12 insertions, 3 deletions

diff --git a/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs b/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs
index e8083b3632..d2c5b9e4e8 100644
--- a/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs
+++ b/MediaBrowser.Controller/Dlna/IDeviceDiscovery.cs
@@ -1,10 +1,20 @@
 using System;
+using System.Collections.Generic;
+using System.Net;
+using MediaBrowser.Model.Events;
 
 namespace MediaBrowser.Controller.Dlna
 {
     public interface IDeviceDiscovery
     {
-        event EventHandler<SsdpMessageEventArgs> DeviceDiscovered;
-        event EventHandler<SsdpMessageEventArgs> DeviceLeft;
+        event EventHandler<GenericEventArgs<UpnpDeviceInfo>> DeviceDiscovered;
+        event EventHandler<GenericEventArgs<UpnpDeviceInfo>> DeviceLeft;
+    }
+
+    public class UpnpDeviceInfo
+    {
+        public Uri Location { get; set; }
+        public Dictionary<string, string> Headers { get; set; }
+        public IPEndPoint LocalEndPoint { get; set; }
     }
 }
diff --git a/MediaBrowser.Controller/Dlna/ISsdpHandler.cs b/MediaBrowser.Controller/Dlna/ISsdpHandler.cs
index e4126ddcf4..ec3a00aad7 100644
--- a/MediaBrowser.Controller/Dlna/ISsdpHandler.cs
+++ b/MediaBrowser.Controller/Dlna/ISsdpHandler.cs
@@ -4,6 +4,5 @@ namespace MediaBrowser.Controller.Dlna
 {
     public interface ISsdpHandler
     {
-        event EventHandler<SsdpMessageEventArgs> MessageReceived;
     }
 }