rework dlna project

Emby.Dlna/Common/Argument.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Dlna.Common
+namespace Emby.Dlna.Common
 {  
     public class Argument
     {

Emby.Dlna/Common/DeviceIcon.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Dlna.Common
+namespace Emby.Dlna.Common
 {
     public class DeviceIcon
     {

Emby.Dlna/Common/DeviceService.cs

@@ -1,5 +1,5 @@
 
-namespace MediaBrowser.Dlna.Common
+namespace Emby.Dlna.Common
 {
     public class DeviceService
     {

Emby.Dlna/Common/ServiceAction.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.Common
+namespace Emby.Dlna.Common
 {
     public class ServiceAction
     {

Emby.Dlna/Common/StateVariable.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.Common
+namespace Emby.Dlna.Common
 {
     public class StateVariable
     {

Emby.Dlna/ConfigurationExtension.cs

@@ -2,7 +2,7 @@
 using MediaBrowser.Model.Configuration;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna
+namespace Emby.Dlna
 {
     public static class ConfigurationExtension
     {

Emby.Dlna/ConnectionManager/ConnectionManager.cs

@@ -1,11 +1,11 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using MediaBrowser.Model.Logging;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.ConnectionManager
+namespace Emby.Dlna.ConnectionManager
 {
     public class ConnectionManager : BaseService, IConnectionManager
     {

Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.ConnectionManager
+namespace Emby.Dlna.ConnectionManager
 {
     public class ConnectionManagerXmlBuilder
     {

Emby.Dlna/ConnectionManager/ControlHandler.cs

@@ -1,13 +1,13 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.ConnectionManager
+namespace Emby.Dlna.ConnectionManager
 {
     public class ControlHandler : BaseControlHandler
     {

Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.ConnectionManager
+namespace Emby.Dlna.ConnectionManager
 {
     public class ServiceActionListBuilder
     {

Emby.Dlna/ContentDirectory/ContentDirectory.cs

@@ -5,7 +5,7 @@ using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Logging;
 using System;
@@ -14,7 +14,7 @@ using System.Linq;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Globalization;
 
-namespace MediaBrowser.Dlna.ContentDirectory
+namespace Emby.Dlna.ContentDirectory
 {
     public class ContentDirectory : BaseService, IContentDirectory, IDisposable
     {

Emby.Dlna/ContentDirectory/ContentDirectoryBrowser.cs

@@ -10,9 +10,9 @@ using System.Security;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
 
-namespace MediaBrowser.Dlna.ContentDirectory
+namespace Emby.Dlna.ContentDirectory
 {
     public class ContentDirectoryBrowser
     {

Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.ContentDirectory
+namespace Emby.Dlna.ContentDirectory
 {
     public class ContentDirectoryXmlBuilder
     {

Emby.Dlna/ContentDirectory/ControlHandler.cs

@@ -6,9 +6,9 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Dlna.Didl;
+using Emby.Dlna.Didl;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
@@ -25,7 +25,7 @@ using System.Xml;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Globalization;
 
-namespace MediaBrowser.Dlna.ContentDirectory
+namespace Emby.Dlna.ContentDirectory
 {
     public class ControlHandler : BaseControlHandler
     {

Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.ContentDirectory
+namespace Emby.Dlna.ContentDirectory
 {
     public class ServiceActionListBuilder
     {

Emby.Dlna/Didl/DidlBuilder.cs

@@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Playlists;
-using MediaBrowser.Dlna.ContentDirectory;
+using Emby.Dlna.ContentDirectory;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
@@ -22,7 +22,7 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Globalization;
 
-namespace MediaBrowser.Dlna.Didl
+namespace Emby.Dlna.Didl
 {
     public class DidlBuilder
     {

Emby.Dlna/Didl/Filter.cs

@@ -3,7 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MediaBrowser.Dlna.Didl
+namespace Emby.Dlna.Didl
 {
     public class Filter
     {

Emby.Dlna/DlnaManager.cs

@@ -4,8 +4,8 @@ using MediaBrowser.Controller;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Plugins;
-using MediaBrowser.Dlna.Profiles;
+using Emby.Dlna.Profiles;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Logging;
@@ -23,7 +23,7 @@ using MediaBrowser.Model.IO;
 using System.Reflection;
 #endif
 
-namespace MediaBrowser.Dlna
+namespace Emby.Dlna
 {
     public class DlnaManager : IDlnaManager
     {
@@ -328,7 +328,7 @@ namespace MediaBrowser.Dlna
 
                     if (string.Equals(Path.GetExtension(path), ".xml", StringComparison.OrdinalIgnoreCase))
                     {
-                        var tempProfile = (MediaBrowser.Dlna.ProfileSerialization.DeviceProfile)_xmlSerializer.DeserializeFromFile(typeof(MediaBrowser.Dlna.ProfileSerialization.DeviceProfile), path);
+                        var tempProfile = (Emby.Dlna.ProfileSerialization.DeviceProfile)_xmlSerializer.DeserializeFromFile(typeof(Emby.Dlna.ProfileSerialization.DeviceProfile), path);
 
                         var json = _jsonSerializer.SerializeToString(tempProfile);
                         profile = (DeviceProfile)_jsonSerializer.DeserializeFromString<DeviceProfile>(json);

Emby.Dlna/Eventing/EventManager.cs

@@ -10,7 +10,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MediaBrowser.Dlna.Eventing
+namespace Emby.Dlna.Eventing
 {
     public class EventManager : IEventManager
     {

Emby.Dlna/Eventing/EventSubscription.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.Eventing
+namespace Emby.Dlna.Eventing
 {
     public class EventSubscription
     {

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -8,8 +8,8 @@ using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Dlna.PlayTo;
+using Emby.Dlna.PlayTo;
-using MediaBrowser.Dlna.Ssdp;
+using Emby.Dlna.Ssdp;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
@@ -22,7 +22,7 @@ using MediaBrowser.Model.Globalization;
 using Rssdp;
 using Rssdp.Infrastructure;
 
-namespace MediaBrowser.Dlna.Main
+namespace Emby.Dlna.Main
 {
     public class DlnaEntryPoint : IServerEntryPoint
     {

Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs

@@ -1,12 +1,12 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.MediaReceiverRegistrar
+namespace Emby.Dlna.MediaReceiverRegistrar
 {
     public class ControlHandler : BaseControlHandler
     {

Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs

@@ -1,12 +1,12 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.MediaReceiverRegistrar
+namespace Emby.Dlna.MediaReceiverRegistrar
 {
     public class MediaReceiverRegistrar : BaseService, IMediaReceiverRegistrar, IDisposable
     {

Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
-using MediaBrowser.Dlna.Service;
+using Emby.Dlna.Service;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.MediaReceiverRegistrar
+namespace Emby.Dlna.MediaReceiverRegistrar
 {
     public class MediaReceiverRegistrarXmlBuilder
     {

Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs

@@ -1,7 +1,7 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.MediaReceiverRegistrar
+namespace Emby.Dlna.MediaReceiverRegistrar
 {
     public class ServiceActionListBuilder
     {

Emby.Dlna/PlayTo/CurrentIdEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class CurrentIdEventArgs : EventArgs
     {

Emby.Dlna/PlayTo/Device.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
-using MediaBrowser.Dlna.Ssdp;
+using Emby.Dlna.Ssdp;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
 using System;
@@ -13,9 +13,9 @@ using System.Security;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class Device : IDisposable
     {

Emby.Dlna/PlayTo/DeviceInfo.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;
 using System.Collections.Generic;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class DeviceInfo
     {

Emby.Dlna/PlayTo/PlayToController.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Session;
-using MediaBrowser.Dlna.Didl;
+using Emby.Dlna.Didl;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
@@ -21,7 +21,7 @@ using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class PlayToController : ISessionController, IDisposable
     {

Emby.Dlna/PlayTo/PlayToManager.cs

@@ -18,7 +18,7 @@ using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     class PlayToManager : IDisposable
     {

Emby.Dlna/PlayTo/PlaybackProgressEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class PlaybackProgressEventArgs : EventArgs
     {

Emby.Dlna/PlayTo/PlaybackStartEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class PlaybackStartEventArgs : EventArgs
     {

Emby.Dlna/PlayTo/PlaybackStoppedEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class PlaybackStoppedEventArgs : EventArgs
     {

Emby.Dlna/PlayTo/PlaylistItem.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class PlaylistItem
     {

Emby.Dlna/PlayTo/PlaylistItemFactory.cs

@@ -6,7 +6,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class PlaylistItemFactory
     {

Emby.Dlna/PlayTo/SsdpHttpClient.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using System;
 using System.Globalization;
 using System.IO;
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class SsdpHttpClient
     {

Emby.Dlna/PlayTo/TRANSPORTSTATE.cs

@@ -1,4 +1,4 @@
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public enum TRANSPORTSTATE
     {

Emby.Dlna/PlayTo/TransportCommands.cs

@@ -1,11 +1,11 @@
 using System;
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
-using MediaBrowser.Dlna.Ssdp;
+using Emby.Dlna.Ssdp;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class TransportCommands
     {

Emby.Dlna/PlayTo/TransportStateEventArgs.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class TransportStateEventArgs : EventArgs
     {

Emby.Dlna/PlayTo/UpnpContainer.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Xml.Linq;
-using MediaBrowser.Dlna.Ssdp;
+using Emby.Dlna.Ssdp;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class UpnpContainer : uBaseObject
     {

Emby.Dlna/PlayTo/uBaseObject.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class uBaseObject 
     {
@@ -38,17 +38,17 @@ namespace MediaBrowser.Dlna.PlayTo
             {
                 var classType = UpnpClass ?? string.Empty;
 
-                if (classType.IndexOf(Model.Entities.MediaType.Audio, StringComparison.Ordinal) != -1)
+                if (classType.IndexOf(MediaBrowser.Model.Entities.MediaType.Audio, StringComparison.Ordinal) != -1)
                 {
-                    return Model.Entities.MediaType.Audio;
+                    return MediaBrowser.Model.Entities.MediaType.Audio;
                 }
-                if (classType.IndexOf(Model.Entities.MediaType.Video, StringComparison.Ordinal) != -1)
+                if (classType.IndexOf(MediaBrowser.Model.Entities.MediaType.Video, StringComparison.Ordinal) != -1)
                 {
-                    return Model.Entities.MediaType.Video;
+                    return MediaBrowser.Model.Entities.MediaType.Video;
                 }
                 if (classType.IndexOf("image", StringComparison.Ordinal) != -1)
                 {
-                    return Model.Entities.MediaType.Photo;
+                    return MediaBrowser.Model.Entities.MediaType.Photo;
                 }
 
                 return null;

Emby.Dlna/PlayTo/uParser.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class uParser
     {

Emby.Dlna/PlayTo/uParserObject.cs

@@ -1,6 +1,6 @@
 using System.Xml.Linq;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class uParserObject
     {

Emby.Dlna/PlayTo/uPnpNamespaces.cs

@@ -1,6 +1,6 @@
 using System.Xml.Linq;
 
-namespace MediaBrowser.Dlna.PlayTo
+namespace Emby.Dlna.PlayTo
 {
     public class uPnpNamespaces
     {

Emby.Dlna/ProfileSerialization/CodecProfile.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class CodecProfile
     {

Emby.Dlna/ProfileSerialization/ContainerProfile.cs

@@ -2,7 +2,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class ContainerProfile
     {

Emby.Dlna/ProfileSerialization/DeviceProfile.cs

@@ -3,7 +3,7 @@ using MediaBrowser.Model.MediaInfo;
 using System.Collections.Generic;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     [XmlRoot("Profile")]
     public class DeviceProfile
@@ -232,7 +232,7 @@ namespace MediaBrowser.Dlna.ProfileSerialization
 
         private MediaBrowser.Model.Dlna.ProfileCondition GetModelProfileCondition(ProfileCondition c)
         {
-            return new Model.Dlna.ProfileCondition
+            return new MediaBrowser.Model.Dlna.ProfileCondition
             {
                 Condition = c.Condition,
                 IsRequired = c.IsRequired,

Emby.Dlna/ProfileSerialization/DirectPlayProfile.cs

@@ -2,7 +2,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class DirectPlayProfile
     {

Emby.Dlna/ProfileSerialization/HttpHeaderInfo.cs

@@ -1,7 +1,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class HttpHeaderInfo
     {

Emby.Dlna/ProfileSerialization/ProfileCondition.cs

@@ -1,7 +1,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class ProfileCondition
     {

Emby.Dlna/ProfileSerialization/ResponseProfile.cs

@@ -2,7 +2,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class ResponseProfile
     {

Emby.Dlna/ProfileSerialization/SubtitleProfile.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class SubtitleProfile
     {

Emby.Dlna/ProfileSerialization/TranscodingProfile.cs

@@ -2,7 +2,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class TranscodingProfile
     {

Emby.Dlna/ProfileSerialization/XmlAttribute.cs

@@ -1,6 +1,6 @@
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.ProfileSerialization
+namespace Emby.Dlna.ProfileSerialization
 {
     public class XmlAttribute
     {

Emby.Dlna/Profiles/BubbleUpnpProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class BubbleUpnpProfile : DefaultProfile

Emby.Dlna/Profiles/DefaultProfile.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class DefaultProfile : DeviceProfile

Emby.Dlna/Profiles/DenonAvrProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class DenonAvrProfile : DefaultProfile

Emby.Dlna/Profiles/DirectTvProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class DirectTvProfile : DefaultProfile

Emby.Dlna/Profiles/DishHopperJoeyProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class DishHopperJoeyProfile : DefaultProfile

Emby.Dlna/Profiles/Foobar2000Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class Foobar2000Profile : DefaultProfile

Emby.Dlna/Profiles/KodiProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class KodiProfile : DefaultProfile

Emby.Dlna/Profiles/LgTvProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class LgTvProfile : DefaultProfile

Emby.Dlna/Profiles/LinksysDMA2100Profile.cs

@@ -1,7 +1,7 @@
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class LinksysDMA2100Profile : DefaultProfile

Emby.Dlna/Profiles/MediaMonkeyProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class MediaMonkeyProfile : DefaultProfile

Emby.Dlna/Profiles/PanasonicVieraProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class PanasonicVieraProfile : DefaultProfile

Emby.Dlna/Profiles/PopcornHourProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class PopcornHourProfile : DefaultProfile

Emby.Dlna/Profiles/SamsungSmartTvProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SamsungSmartTvProfile : DefaultProfile

Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBlurayPlayer2013 : DefaultProfile

Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBlurayPlayer2014 : DefaultProfile

Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBlurayPlayer2015 : DefaultProfile

Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBlurayPlayer2016 : DefaultProfile

Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBlurayPlayerProfile : DefaultProfile

Emby.Dlna/Profiles/SonyBravia2010Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBravia2010Profile : DefaultProfile

Emby.Dlna/Profiles/SonyBravia2011Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBravia2011Profile : DefaultProfile

Emby.Dlna/Profiles/SonyBravia2012Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBravia2012Profile : DefaultProfile

Emby.Dlna/Profiles/SonyBravia2013Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBravia2013Profile : DefaultProfile

Emby.Dlna/Profiles/SonyBravia2014Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyBravia2014Profile : DefaultProfile

Emby.Dlna/Profiles/SonyPs3Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyPs3Profile : DefaultProfile

Emby.Dlna/Profiles/SonyPs4Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class SonyPs4Profile : DefaultProfile

Emby.Dlna/Profiles/VlcProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class VlcProfile : DefaultProfile

Emby.Dlna/Profiles/WdtvLiveProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class WdtvLiveProfile : DefaultProfile

Emby.Dlna/Profiles/Xbox360Profile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     /// <summary>
     /// Good info on xbox 360 requirements: https://code.google.com/p/jems/wiki/XBox360Notes

Emby.Dlna/Profiles/XboxOneProfile.cs

@@ -1,7 +1,7 @@
 using MediaBrowser.Model.Dlna;
 using System.Xml.Serialization;
 
-namespace MediaBrowser.Dlna.Profiles
+namespace Emby.Dlna.Profiles
 {
     [XmlRoot("Profile")]
     public class XboxOneProfile : DefaultProfile

Emby.Dlna/Server/DescriptionXmlBuilder.cs

@@ -1,4 +1,4 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Extensions;
 using System;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Security;
 using System.Text;
 
-namespace MediaBrowser.Dlna.Server
+namespace Emby.Dlna.Server
 {
     public class DescriptionXmlBuilder
     {

Emby.Dlna/Server/Headers.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace MediaBrowser.Dlna.Server
+namespace Emby.Dlna.Server
 {
     public class Headers : IDictionary<string, string>
     {

Emby.Dlna/Server/UpnpDevice.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 
-namespace MediaBrowser.Dlna.Server
+namespace Emby.Dlna.Server
 {
     public sealed class UpnpDevice
     {

Emby.Dlna/Service/BaseControlHandler.cs

@@ -1,6 +1,6 @@
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Xml;
 
-namespace MediaBrowser.Dlna.Service
+namespace Emby.Dlna.Service
 {
     public abstract class BaseControlHandler
     {

Emby.Dlna/Service/BaseService.cs

@@ -1,9 +1,9 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Dlna.Eventing;
+using Emby.Dlna.Eventing;
 using MediaBrowser.Model.Logging;
 
-namespace MediaBrowser.Dlna.Service
+namespace Emby.Dlna.Service
 {
     public class BaseService : IEventManager
     {

Emby.Dlna/Service/ControlErrorHandler.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Xml;
 
-namespace MediaBrowser.Dlna.Service
+namespace Emby.Dlna.Service
 {
     public class ControlErrorHandler
     {

Emby.Dlna/Service/ServiceXmlBuilder.cs

@@ -1,10 +1,10 @@
-using MediaBrowser.Dlna.Common;
+using Emby.Dlna.Common;
 using System.Collections.Generic;
 using System.Security;
 using System.Text;
-using MediaBrowser.Dlna.Server;
+using Emby.Dlna.Server;
 
-namespace MediaBrowser.Dlna.Service
+namespace Emby.Dlna.Service
 {
     public class ServiceXmlBuilder
     {

Emby.Dlna/Ssdp/DeviceDiscovery.cs

@@ -15,7 +15,7 @@ using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
 using Rssdp;
 
-namespace MediaBrowser.Dlna.Ssdp
+namespace Emby.Dlna.Ssdp
 {
     public class DeviceDiscovery : IDeviceDiscovery, IDisposable
     {

Emby.Dlna/Ssdp/Extensions.cs

@@ -5,7 +5,7 @@ using System.Net.Sockets;
 using System.Threading.Tasks;
 using System.Xml.Linq;
 
-namespace MediaBrowser.Dlna.Ssdp
+namespace Emby.Dlna.Ssdp
 {
     public static class Extensions
     {

MediaBrowser.Dlna/Channels/DlnaChannelFactory.cs

@@ -1,289 +0,0 @@
-namespace MediaBrowser.Dlna.Channels
-{
-    //public class DlnaChannel : IChannel, IDisposable
-    //{
-    //    private readonly ILogger _logger;
-    //    private readonly IHttpClient _httpClient;
-    //    private readonly IServerConfigurationManager _config;
-    //    private List<Device> _servers = new List<Device>();
-
-    //    private readonly IDeviceDiscovery _deviceDiscovery;
-    //    private readonly SemaphoreSlim _syncLock = new SemaphoreSlim(1, 1);
-    //    private Func<List<string>> _localServersLookup;
-
-    //    public static DlnaChannel Current;
-
-    //    public DlnaChannel(ILogger logger, IHttpClient httpClient, IDeviceDiscovery deviceDiscovery, IServerConfigurationManager config)
-    //    {
-    //        _logger = logger;
-    //        _httpClient = httpClient;
-    //        _deviceDiscovery = deviceDiscovery;
-    //        _config = config;
-    //        Current = this;
-    //    }
-
-    //    public string Name
-    //    {
-    //        get { return "Devices"; }
-    //    }
-
-    //    public string Description
-    //    {
-    //        get { return string.Empty; }
-    //    }
-
-    //    public string DataVersion
-    //    {
-    //        get { return DateTime.UtcNow.Ticks.ToString(); }
-    //    }
-
-    //    public string HomePageUrl
-    //    {
-    //        get { return string.Empty; }
-    //    }
-
-    //    public ChannelParentalRating ParentalRating
-    //    {
-    //        get { return ChannelParentalRating.GeneralAudience; }
-    //    }
-
-    //    public InternalChannelFeatures GetChannelFeatures()
-    //    {
-    //        return new InternalChannelFeatures
-    //        {
-    //            ContentTypes = new List<ChannelMediaContentType>
-    //                {
-    //                    ChannelMediaContentType.Song,
-    //                    ChannelMediaContentType.Clip
-    //                },
-
-    //            MediaTypes = new List<ChannelMediaType>
-    //                {
-    //                    ChannelMediaType.Audio,
-    //                    ChannelMediaType.Video,
-    //                    ChannelMediaType.Photo
-    //                }
-    //        };
-    //    }
-
-    //    public bool IsEnabledFor(string userId)
-    //    {
-    //        return true;
-    //    }
-
-    //    public Task<DynamicImageResponse> GetChannelImage(ImageType type, CancellationToken cancellationToken)
-    //    {
-    //        throw new NotImplementedException();
-    //    }
-
-    //    public IEnumerable<ImageType> GetSupportedChannelImages()
-    //    {
-    //        return new List<ImageType>
-    //            {
-    //                ImageType.Primary
-    //            };
-    //    }
-
-    //    public void Start(Func<List<string>> localServersLookup)
-    //    {
-    //        _localServersLookup = localServersLookup;
-
-    //        _deviceDiscovery.DeviceDiscovered -= deviceDiscovery_DeviceDiscovered;
-    //        _deviceDiscovery.DeviceLeft -= deviceDiscovery_DeviceLeft;
-
-    //        _deviceDiscovery.DeviceDiscovered += deviceDiscovery_DeviceDiscovered;
-    //        _deviceDiscovery.DeviceLeft += deviceDiscovery_DeviceLeft;
-    //    }
-
-    //    public async Task<ChannelItemResult> GetChannelItems(InternalChannelItemQuery query, CancellationToken cancellationToken)
-    //    {
-    //        if (string.IsNullOrWhiteSpace(query.FolderId))
-    //        {
-    //            return await GetServers(query, cancellationToken).ConfigureAwait(false);
-    //        }
-
-    //        return new ChannelItemResult();
-
-    //        //var idParts = query.FolderId.Split('|');
-    //        //var folderId = idParts.Length == 2 ? idParts[1] : null;
-
-    //        //var result = await new ContentDirectoryBrowser(_httpClient, _logger).Browse(new ContentDirectoryBrowseRequest
-    //        //{
-    //        //    Limit = query.Limit,
-    //        //    StartIndex = query.StartIndex,
-    //        //    ParentId = folderId,
-    //        //    ContentDirectoryUrl = ControlUrl
-
-    //        //}, cancellationToken).ConfigureAwait(false);
-
-    //        //items = result.Items.ToList();
-
-    //        //var list = items.ToList();
-    //        //var count = list.Count;
-
-    //        //list = ApplyPaging(list, query).ToList();
-
-    //        //return new ChannelItemResult
-    //        //{
-    //        //    Items = list,
-    //        //    TotalRecordCount = count
-    //        //};
-    //    }
-
-    //    public async Task<ChannelItemResult> GetServers(InternalChannelItemQuery query, CancellationToken cancellationToken)
-    //    {
-    //        await _syncLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-    //        try
-    //        {
-    //            var items = _servers.Select(i =>
-    //            {
-    //                var service = i.Properties.Services
-    //                .FirstOrDefault(s => string.Equals(s.ServiceType, "urn:schemas-upnp-org:service:ContentDirectory:1", StringComparison.OrdinalIgnoreCase));
-
-    //                var controlUrl = service == null ? null : (_servers[0].Properties.BaseUrl.TrimEnd('/') + "/" + service.ControlUrl.TrimStart('/'));
-
-    //                if (string.IsNullOrWhiteSpace(controlUrl))
-    //                {
-    //                    return null;
-    //                }
-
-    //                return new ChannelItemInfo
-    //                {
-    //                    Id = i.Properties.UUID,
-    //                    Name = i.Properties.Name,
-    //                    Type = ChannelItemType.Folder
-    //                };
-
-    //            }).Where(i => i != null).ToList();
-
-    //            return new ChannelItemResult
-    //            {
-    //                TotalRecordCount = items.Count,
-    //                Items = items
-    //            };
-    //        }
-    //        finally
-    //        {
-    //            _syncLock.Release();
-    //        }
-    //    }
-
-    //    async void deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
-    //    {
-    //        string usn;
-    //        if (!e.Headers.TryGetValue("USN", out usn)) usn = string.Empty;
-
-    //        string nt;
-    //        if (!e.Headers.TryGetValue("NT", out nt)) nt = string.Empty;
-
-    //        string location;
-    //        if (!e.Headers.TryGetValue("Location", out location)) location = string.Empty;
-
-    //        if (!IsValid(nt, usn))
-    //        {
-    //            return;
-    //        }
-
-    //        if (_localServersLookup != null)
-    //        {
-    //            if (_localServersLookup().Any(i => usn.IndexOf(i, StringComparison.OrdinalIgnoreCase) != -1))
-    //            {
-    //                // Don't add the local Dlna server to this
-    //                return;
-    //            }
-    //        }
-
-    //        await _syncLock.WaitAsync().ConfigureAwait(false);
-
-    //        var serverList = _servers.ToList();
-
-    //        try
-    //        {
-    //            if (GetExistingServers(serverList, usn).Any())
-    //            {
-    //                return;
-    //            }
-
-    //            var device = await Device.CreateuPnpDeviceAsync(new Uri(location), _httpClient, _config, _logger)
-    //                        .ConfigureAwait(false);
-
-    //            if (!serverList.Any(i => string.Equals(i.Properties.UUID, device.Properties.UUID, StringComparison.OrdinalIgnoreCase)))
-    //            {
-    //                serverList.Add(device);
-    //            }
-    //        }
-    //        catch (Exception ex)
-    //        {
-
-    //        }
-    //        finally
-    //        {
-    //            _syncLock.Release();
-    //        }
-    //    }
-
-    //    async void deviceDiscovery_DeviceLeft(object sender, SsdpMessageEventArgs e)
-    //    {
-    //        string usn;
-    //        if (!e.Headers.TryGetValue("USN", out usn)) usn = String.Empty;
-
-    //        string nt;
-    //        if (!e.Headers.TryGetValue("NT", out nt)) nt = String.Empty;
-
-    //        if (!IsValid(nt, usn))
-    //        {
-    //            return;
-    //        }
-
-    //        await _syncLock.WaitAsync().ConfigureAwait(false);
-
-    //        try
-    //        {
-    //            var serverList = _servers.ToList();
-
-    //            var matchingServers = GetExistingServers(serverList, usn);
-    //            if (matchingServers.Count > 0)
-    //            {
-    //                foreach (var device in matchingServers)
-    //                {
-    //                    serverList.Remove(device);
-    //                }
-
-    //                _servers = serverList;
-    //            }
-    //        }
-    //        finally
-    //        {
-    //            _syncLock.Release();
-    //        }
-    //    }
-
-    //    private bool IsValid(string nt, string usn)
-    //    {
-    //        // It has to report that it's a media renderer
-    //        if (usn.IndexOf("ContentDirectory:", StringComparison.OrdinalIgnoreCase) == -1 &&
-    //                 nt.IndexOf("ContentDirectory:", StringComparison.OrdinalIgnoreCase) == -1 &&
-    //                 usn.IndexOf("MediaServer:", StringComparison.OrdinalIgnoreCase) == -1 &&
-    //                 nt.IndexOf("MediaServer:", StringComparison.OrdinalIgnoreCase) == -1)
-    //        {
-    //            return false;
-    //        }
-
-    //        return true;
-    //    }
-
-    //    private List<Device> GetExistingServers(List<Device> allDevices, string usn)
-    //    {
-    //        return allDevices
-    //            .Where(i => usn.IndexOf(i.Properties.UUID, StringComparison.OrdinalIgnoreCase) != -1)
-    //            .ToList();
-    //    }
-
-    //    public void Dispose()
-    //    {
-    //        _deviceDiscovery.DeviceDiscovered -= deviceDiscovery_DeviceDiscovered;
-    //        _deviceDiscovery.DeviceLeft -= deviceDiscovery_DeviceLeft;
-    //    }
-    //}
-}

MediaBrowser.Dlna/Common/Argument.cs

@@ -1,12 +0,0 @@
-
-namespace MediaBrowser.Dlna.Common
-{  
-    public class Argument
-    {
-        public string Name { get;  set; }
-
-        public string Direction { get;  set; }
-
-        public string RelatedStateVariable { get;  set; }
-    }
-}

MediaBrowser.Dlna/Common/DeviceIcon.cs

@@ -1,21 +0,0 @@
-
-namespace MediaBrowser.Dlna.Common
-{
-    public class DeviceIcon
-    {
-        public string Url { get; set; }
-
-        public string MimeType { get; set; }
-
-        public int Width { get; set; }
-
-        public int Height { get; set; }
-
-        public string Depth { get; set; }
-
-        public override string ToString()
-        {
-            return string.Format("{0}x{1}", Height, Width);
-        }
-    }
-}

MediaBrowser.Dlna/Common/DeviceService.cs

@@ -1,21 +0,0 @@
-
-namespace MediaBrowser.Dlna.Common
-{
-    public class DeviceService
-    {
-        public string ServiceType { get; set; }
-
-        public string ServiceId { get; set; }
-
-        public string ScpdUrl { get; set; }
-
-        public string ControlUrl { get; set; }
-
-        public string EventSubUrl { get; set; }
-
-        public override string ToString()
-        {
-            return string.Format("{0}", ServiceId);
-        }
-    }
-}

MediaBrowser.Dlna/Common/ServiceAction.cs

@@ -1,21 +0,0 @@
-using System.Collections.Generic;
-
-namespace MediaBrowser.Dlna.Common
-{
-    public class ServiceAction
-    {
-        public string Name { get; set; }
-
-        public List<Argument> ArgumentList { get; set; }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        public ServiceAction()
-        {
-            ArgumentList = new List<Argument>();
-        }
-    }
-}

MediaBrowser.Dlna/Common/StateVariable.cs

@@ -1,25 +0,0 @@
-using System.Collections.Generic;
-
-namespace MediaBrowser.Dlna.Common
-{
-    public class StateVariable
-    {
-        public string Name { get; set; }
-
-        public string DataType { get; set; }
-
-        public bool SendsEvents { get; set; }
-
-        public List<string> AllowedValues { get; set; }
-
-        public override string ToString()
-        {
-            return Name;
-        }
-
-        public StateVariable()
-        {
-            AllowedValues = new List<string>();
-        }
-    }
-}

MediaBrowser.Dlna/ConfigurationExtension.cs

@@ -1,29 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Model.Configuration;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Dlna
-{
-    public static class ConfigurationExtension
-    {
-        public static DlnaOptions GetDlnaConfiguration(this IConfigurationManager manager)
-        {
-            return manager.GetConfiguration<DlnaOptions>("dlna");
-        }
-    }
-
-    public class DlnaConfigurationFactory : IConfigurationFactory
-    {
-        public IEnumerable<ConfigurationStore> GetConfigurations()
-        {
-            return new List<ConfigurationStore>
-            {
-                new ConfigurationStore
-                {
-                    Key = "dlna",
-                    ConfigurationType = typeof (DlnaOptions)
-                }
-            };
-        }
-    }
-}

MediaBrowser.Dlna/ConnectionManager/ConnectionManager.cs

@@ -1,37 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Dlna.Service;
-using MediaBrowser.Model.Logging;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Dlna.ConnectionManager
-{
-    public class ConnectionManager : BaseService, IConnectionManager
-    {
-        private readonly IDlnaManager _dlna;
-        private readonly ILogger _logger;
-        private readonly IServerConfigurationManager _config;
-
-        public ConnectionManager(IDlnaManager dlna, IServerConfigurationManager config, ILogger logger, IHttpClient httpClient)
-            : base(logger, httpClient)
-        {
-            _dlna = dlna;
-            _config = config;
-            _logger = logger;
-        }
-
-        public string GetServiceXml(IDictionary<string, string> headers)
-        {
-            return new ConnectionManagerXmlBuilder().GetXml();
-        }
-
-        public ControlResponse ProcessControlRequest(ControlRequest request)
-        {
-            var profile = _dlna.GetProfile(request.Headers) ??
-                         _dlna.GetDefaultProfile();
-
-            return new ControlHandler(_logger, profile, _config).ProcessControlRequest(request);
-        }
-    }
-}