Browse Source

Visual Studio Reformat: Emby.Dlna

Erwin de Haan 6 years ago
parent
commit
8bfb54a41b
65 changed files with 162 additions and 236 deletions
  1. 7 7
      Emby.Dlna/Api/DlnaServerService.cs
  2. 3 3
      Emby.Dlna/Common/Argument.cs
  3. 1 2
      Emby.Dlna/Common/StateVariable.cs
  4. 2 2
      Emby.Dlna/ConfigurationExtension.cs
  5. 3 3
      Emby.Dlna/ConnectionManager/ConnectionManager.cs
  6. 1 1
      Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs
  7. 5 6
      Emby.Dlna/ConnectionManager/ControlHandler.cs
  8. 1 1
      Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs
  9. 6 6
      Emby.Dlna/ContentDirectory/ContentDirectory.cs
  10. 1 1
      Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs
  11. 17 22
      Emby.Dlna/ContentDirectory/ControlHandler.cs
  12. 2 2
      Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs
  13. 12 13
      Emby.Dlna/Didl/DidlBuilder.cs
  14. 2 3
      Emby.Dlna/Didl/Filter.cs
  15. 0 2
      Emby.Dlna/Didl/StringWriterWithEncoding.cs
  16. 11 13
      Emby.Dlna/DlnaManager.cs
  17. 4 5
      Emby.Dlna/Eventing/EventManager.cs
  18. 10 10
      Emby.Dlna/Main/DlnaEntryPoint.cs
  19. 4 5
      Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs
  20. 4 6
      Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs
  21. 1 1
      Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs
  22. 2 2
      Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs
  23. 1 1
      Emby.Dlna/PlayTo/CurrentIdEventArgs.cs
  24. 6 10
      Emby.Dlna/PlayTo/Device.cs
  25. 2 2
      Emby.Dlna/PlayTo/DeviceInfo.cs
  26. 12 15
      Emby.Dlna/PlayTo/PlayToController.cs
  27. 9 12
      Emby.Dlna/PlayTo/PlayToManager.cs
  28. 3 4
      Emby.Dlna/PlayTo/PlaylistItemFactory.cs
  29. 4 4
      Emby.Dlna/PlayTo/SsdpHttpClient.cs
  30. 1 1
      Emby.Dlna/PlayTo/TransportCommands.cs
  31. 2 4
      Emby.Dlna/Profiles/DefaultProfile.cs
  32. 0 1
      Emby.Dlna/Profiles/DenonAvrProfile.cs
  33. 0 1
      Emby.Dlna/Profiles/DirectTvProfile.cs
  34. 0 1
      Emby.Dlna/Profiles/DishHopperJoeyProfile.cs
  35. 0 1
      Emby.Dlna/Profiles/Foobar2000Profile.cs
  36. 0 1
      Emby.Dlna/Profiles/LgTvProfile.cs
  37. 1 2
      Emby.Dlna/Profiles/LinksysDMA2100Profile.cs
  38. 1 2
      Emby.Dlna/Profiles/MarantzProfile.cs
  39. 2 3
      Emby.Dlna/Profiles/MediaMonkeyProfile.cs
  40. 0 1
      Emby.Dlna/Profiles/PanasonicVieraProfile.cs
  41. 0 1
      Emby.Dlna/Profiles/PopcornHourProfile.cs
  42. 0 1
      Emby.Dlna/Profiles/SamsungSmartTvProfile.cs
  43. 1 2
      Emby.Dlna/Profiles/SharpSmartTvProfile.cs
  44. 0 1
      Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs
  45. 0 1
      Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs
  46. 0 1
      Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs
  47. 0 1
      Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs
  48. 0 1
      Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs
  49. 0 1
      Emby.Dlna/Profiles/SonyBravia2010Profile.cs
  50. 0 1
      Emby.Dlna/Profiles/SonyBravia2011Profile.cs
  51. 0 1
      Emby.Dlna/Profiles/SonyBravia2012Profile.cs
  52. 0 1
      Emby.Dlna/Profiles/SonyBravia2013Profile.cs
  53. 0 1
      Emby.Dlna/Profiles/SonyBravia2014Profile.cs
  54. 0 1
      Emby.Dlna/Profiles/SonyPs3Profile.cs
  55. 0 1
      Emby.Dlna/Profiles/SonyPs4Profile.cs
  56. 1 2
      Emby.Dlna/Profiles/WdtvLiveProfile.cs
  57. 0 1
      Emby.Dlna/Profiles/XboxOneProfile.cs
  58. 1 2
      Emby.Dlna/Properties/AssemblyInfo.cs
  59. 3 4
      Emby.Dlna/Server/DescriptionXmlBuilder.cs
  60. 5 8
      Emby.Dlna/Service/BaseControlHandler.cs
  61. 2 3
      Emby.Dlna/Service/BaseService.cs
  62. 1 2
      Emby.Dlna/Service/ControlErrorHandler.cs
  63. 1 2
      Emby.Dlna/Service/ServiceXmlBuilder.cs
  64. 3 10
      Emby.Dlna/Ssdp/DeviceDiscovery.cs
  65. 1 4
      Emby.Dlna/Ssdp/Extensions.cs

+ 7 - 7
Emby.Dlna/Api/DlnaServerService.cs

@@ -1,14 +1,14 @@
-using MediaBrowser.Controller.Dlna;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Services;
+using Emby.Dlna.Main;
 using MediaBrowser.Common.Extensions;
-using System.Text;
+using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Net;
-using System.Linq;
-using Emby.Dlna.Main;
+using MediaBrowser.Model.Services;
 
 namespace Emby.Dlna.Api
 {
@@ -227,7 +227,7 @@ namespace Emby.Dlna.Api
             // TODO: Work out what this is doing.
             if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) ||
                 string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) ||
-                string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase ))
+                string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase))
             {
                 index++;
             }

+ 3 - 3
Emby.Dlna/Common/Argument.cs

@@ -3,10 +3,10 @@ namespace Emby.Dlna.Common
 {
     public class Argument
     {
-        public string Name { get;  set; }
+        public string Name { get; set; }
 
-        public string Direction { get;  set; }
+        public string Direction { get; set; }
 
-        public string RelatedStateVariable { get;  set; }
+        public string RelatedStateVariable { get; set; }
     }
 }

+ 1 - 2
Emby.Dlna/Common/StateVariable.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System;
+using System;
 
 namespace Emby.Dlna.Common
 {

+ 2 - 2
Emby.Dlna/ConfigurationExtension.cs

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

+ 3 - 3
Emby.Dlna/ConnectionManager/ConnectionManager.cs

@@ -1,8 +1,8 @@
-using MediaBrowser.Common.Net;
+using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
-using Emby.Dlna.Service;
-using System.Collections.Generic;
 using MediaBrowser.Model.Xml;
 using Microsoft.Extensions.Logging;
 

+ 1 - 1
Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs

@@ -1,6 +1,6 @@
+using System.Collections.Generic;
 using Emby.Dlna.Common;
 using Emby.Dlna.Service;
-using System.Collections.Generic;
 
 namespace Emby.Dlna.ConnectionManager
 {

+ 5 - 6
Emby.Dlna/ConnectionManager/ControlHandler.cs

@@ -1,12 +1,11 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Server;
+using System;
+using System.Collections.Generic;
 using Emby.Dlna.Service;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Dlna;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.ConnectionManager
 {

+ 1 - 1
Emby.Dlna/ConnectionManager/ServiceActionListBuilder.cs

@@ -1,5 +1,5 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
 
 namespace Emby.Dlna.ConnectionManager
 {

+ 6 - 6
Emby.Dlna/ContentDirectory/ContentDirectory.cs

@@ -1,18 +1,18 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
-using Emby.Dlna.Service;
-using MediaBrowser.Model.Dlna;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.TV;
+using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.ContentDirectory
 {

+ 1 - 1
Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs

@@ -1,6 +1,6 @@
+using System.Collections.Generic;
 using Emby.Dlna.Common;
 using Emby.Dlna.Service;
-using System.Collections.Generic;
 
 namespace Emby.Dlna.ContentDirectory
 {

+ 17 - 22
Emby.Dlna/ContentDirectory/ControlHandler.cs

@@ -1,37 +1,32 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Channels;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
-using Emby.Dlna.Didl;
-using Emby.Dlna.Server;
-using Emby.Dlna.Service;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Querying;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Xml;
+using Emby.Dlna.Didl;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
+using MediaBrowser.Controller.Entities.Movies;
+using MediaBrowser.Controller.Entities.TV;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.LiveTv;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Playlists;
 using MediaBrowser.Controller.TV;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Xml;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Controller.LiveTv;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -311,7 +306,7 @@ namespace Emby.Dlna.ContentDirectory
 
             var resXML = builder.ToString();
 
-            return new []
+            return new[]
                 {
                     new KeyValuePair<string,string>("Result", resXML),
                     new KeyValuePair<string,string>("NumberReturned", provided.ToString(_usCulture)),
@@ -1144,7 +1139,7 @@ namespace Emby.Dlna.ContentDirectory
                 StartIndex = query.StartIndex,
                 UserId = query.User.Id
 
-            }, new [] { parent }, query.DtoOptions);
+            }, new[] { parent }, query.DtoOptions);
 
             return ToResult(result);
         }

+ 2 - 2
Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs

@@ -1,5 +1,5 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
 
 namespace Emby.Dlna.ContentDirectory
 {
@@ -7,7 +7,7 @@ namespace Emby.Dlna.ContentDirectory
     {
         public IEnumerable<ServiceAction> GetActions()
         {
-            return new []
+            return new[]
             {
                 GetSearchCapabilitiesAction(),
                 GetSortCapabilitiesAction(),

+ 12 - 13
Emby.Dlna/Didl/DidlBuilder.cs

@@ -1,4 +1,11 @@
-using MediaBrowser.Model.Extensions;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using Emby.Dlna.Configuration;
+using Emby.Dlna.ContentDirectory;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
@@ -6,23 +13,15 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Playlists;
-using Emby.Dlna.ContentDirectory;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Net;
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml;
-using MediaBrowser.Controller.MediaEncoding;
-using Emby.Dlna.Configuration;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.Net;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Didl
 {

+ 2 - 3
Emby.Dlna/Didl/Filter.cs

@@ -1,6 +1,5 @@
-using MediaBrowser.Model.Extensions;
-using System;
-using System.Collections.Generic;
+using System;
+using MediaBrowser.Model.Extensions;
 
 namespace Emby.Dlna.Didl
 {

+ 0 - 2
Emby.Dlna/Didl/StringWriterWithEncoding.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Emby.Dlna.Didl
 {

+ 11 - 13
Emby.Dlna/DlnaManager.cs

@@ -1,24 +1,22 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using Emby.Dlna.Profiles;
+using Emby.Dlna.Server;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Plugins;
-using Emby.Dlna.Profiles;
-using Emby.Dlna.Server;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Drawing;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Reflection;
-using MediaBrowser.Model.Extensions;
+using MediaBrowser.Model.Serialization;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna
 {

+ 4 - 5
Emby.Dlna/Eventing/EventManager.cs

@@ -1,14 +1,13 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Dlna;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Eventing
 {

+ 10 - 10
Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -1,4 +1,10 @@
-using MediaBrowser.Common.Configuration;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Emby.Dlna.PlayTo;
+using Emby.Dlna.Ssdp;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
@@ -6,25 +12,19 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Plugins;
 using MediaBrowser.Controller.Session;
 using MediaBrowser.Controller.TV;
-using Emby.Dlna.PlayTo;
-using Emby.Dlna.Ssdp;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Threading;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 using Rssdp;
 using Rssdp.Infrastructure;
-using System.Threading;
 
 namespace Emby.Dlna.Main
 {
@@ -282,7 +282,7 @@ namespace Emby.Dlna.Main
                 SetProperies(device, fullService);
                 _Publisher.AddDevice(device);
 
-                var embeddedDevices = new []
+                var embeddedDevices = new[]
                 {
                     "urn:schemas-upnp-org:service:ContentDirectory:1",
                     "urn:schemas-upnp-org:service:ConnectionManager:1",

+ 4 - 5
Emby.Dlna/MediaReceiverRegistrar/ControlHandler.cs

@@ -1,11 +1,10 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Server;
-using Emby.Dlna.Service;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
+using Emby.Dlna.Service;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {

+ 4 - 6
Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrar.cs

@@ -1,11 +1,9 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
+using System.Collections.Generic;
 using Emby.Dlna.Service;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {

+ 1 - 1
Emby.Dlna/MediaReceiverRegistrar/MediaReceiverRegistrarXmlBuilder.cs

@@ -1,6 +1,6 @@
+using System.Collections.Generic;
 using Emby.Dlna.Common;
 using Emby.Dlna.Service;
-using System.Collections.Generic;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {

+ 2 - 2
Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs

@@ -1,5 +1,5 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
+using Emby.Dlna.Common;
 
 namespace Emby.Dlna.MediaReceiverRegistrar
 {
@@ -7,7 +7,7 @@ namespace Emby.Dlna.MediaReceiverRegistrar
     {
         public IEnumerable<ServiceAction> GetActions()
         {
-            return new []
+            return new[]
             {
                 GetIsValidated(),
                 GetIsAuthorized(),

+ 1 - 1
Emby.Dlna/PlayTo/CurrentIdEventArgs.cs

@@ -4,6 +4,6 @@ namespace Emby.Dlna.PlayTo
 {
     public class CurrentIdEventArgs : EventArgs
     {
-        public string Id { get;  set; }
+        public string Id { get; set; }
     }
 }

+ 6 - 10
Emby.Dlna/PlayTo/Device.cs

@@ -1,21 +1,17 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Common;
-using Emby.Dlna.Ssdp;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Net;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Net;
-using System.Security;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+using Emby.Dlna.Common;
 using Emby.Dlna.Server;
+using Emby.Dlna.Ssdp;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Threading;
-using MediaBrowser.Model.Extensions;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.PlayTo
 {

+ 2 - 2
Emby.Dlna/PlayTo/DeviceInfo.cs

@@ -1,6 +1,6 @@
-using Emby.Dlna.Common;
+using System.Collections.Generic;
+using Emby.Dlna.Common;
 using MediaBrowser.Model.Dlna;
-using System.Collections.Generic;
 
 namespace Emby.Dlna.PlayTo
 {

+ 12 - 15
Emby.Dlna/PlayTo/PlayToController.cs

@@ -1,28 +1,25 @@
-using MediaBrowser.Controller.Dlna;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Session;
-using Emby.Dlna.Didl;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.System;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Dlna.Didl;
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Dlna;
+using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
-using MediaBrowser.Model.Extensions;
-using System.Net.Http;
 using MediaBrowser.Model.Services;
+using MediaBrowser.Model.Session;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.PlayTo
 {

+ 9 - 12
Emby.Dlna/PlayTo/PlayToManager.cs

@@ -1,26 +1,23 @@
-using MediaBrowser.Common.Net;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Dlna;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Session;
-using Microsoft.Extensions.Logging;
-using MediaBrowser.Model.Session;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
 using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Controller.Session;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Session;
 using MediaBrowser.Model.Threading;
-using System.Threading;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Devices;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.PlayTo
 {

+ 3 - 4
Emby.Dlna/PlayTo/PlaylistItemFactory.cs

@@ -1,10 +1,9 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Session;
-using System;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Session;
 
 namespace Emby.Dlna.PlayTo
 {

+ 4 - 4
Emby.Dlna/PlayTo/SsdpHttpClient.cs

@@ -1,13 +1,13 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
-using Emby.Dlna.Common;
 using System;
 using System.Globalization;
 using System.IO;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using System.Threading;
+using Emby.Dlna.Common;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
 
 namespace Emby.Dlna.PlayTo
 {

+ 1 - 1
Emby.Dlna/PlayTo/TransportCommands.cs

@@ -1,8 +1,8 @@
 using System;
-using Emby.Dlna.Common;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml.Linq;
+using Emby.Dlna.Common;
 using Emby.Dlna.Ssdp;
 
 namespace Emby.Dlna.PlayTo

+ 2 - 4
Emby.Dlna/Profiles/DefaultProfile.cs

@@ -1,7 +1,5 @@
-using MediaBrowser.Model.Dlna;
-using System.Linq;
-using System.Xml.Serialization;
-using MediaBrowser.Model.Extensions;
+using System.Linq;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/DenonAvrProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/DirectTvProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/DishHopperJoeyProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/Foobar2000Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/LgTvProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 1 - 2
Emby.Dlna/Profiles/LinksysDMA2100Profile.cs

@@ -1,5 +1,4 @@
-using System.Xml.Serialization;
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {

+ 1 - 2
Emby.Dlna/Profiles/MarantzProfile.cs

@@ -1,5 +1,4 @@
-using System.Xml.Serialization;
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {

+ 2 - 3
Emby.Dlna/Profiles/MediaMonkeyProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {
@@ -14,9 +13,9 @@ namespace Emby.Dlna.Profiles
 
             Identification = new DeviceIdentification
             {
-               FriendlyName = @"MediaMonkey",
+                FriendlyName = @"MediaMonkey",
 
-               Headers = new[]
+                Headers = new[]
                {
                    new HttpHeaderInfo
                    {

+ 0 - 1
Emby.Dlna/Profiles/PanasonicVieraProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/PopcornHourProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SamsungSmartTvProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 1 - 2
Emby.Dlna/Profiles/SharpSmartTvProfile.cs

@@ -1,5 +1,4 @@
-using System.Xml.Serialization;
-using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Dlna;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBlurayPlayer2013.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBlurayPlayer2014.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBlurayPlayer2015.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBlurayPlayer2016.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBlurayPlayerProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBravia2010Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBravia2011Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBravia2012Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBravia2013Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyBravia2014Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyPs3Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 0 - 1
Emby.Dlna/Profiles/SonyPs4Profile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 1 - 2
Emby.Dlna/Profiles/WdtvLiveProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {
@@ -17,7 +16,7 @@ namespace Emby.Dlna.Profiles
             {
                 ModelName = "WD TV",
 
-                Headers = new []
+                Headers = new[]
                 {
                     new HttpHeaderInfo {Name = "User-Agent", Value = "alphanetworks", Match = HeaderMatchType.Substring},
                     new HttpHeaderInfo

+ 0 - 1
Emby.Dlna/Profiles/XboxOneProfile.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Dlna;
-using System.Xml.Serialization;
 
 namespace Emby.Dlna.Profiles
 {

+ 1 - 2
Emby.Dlna/Properties/AssemblyInfo.cs

@@ -1,6 +1,5 @@
-using System.Resources;
 using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Resources;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information

+ 3 - 4
Emby.Dlna/Server/DescriptionXmlBuilder.cs

@@ -1,12 +1,11 @@
-using Emby.Dlna.Common;
-using MediaBrowser.Model.Dlna;
-using MediaBrowser.Model.Extensions;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Security;
 using System.Text;
+using Emby.Dlna.Common;
+using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Extensions;
 
 namespace Emby.Dlna.Server
 {

+ 5 - 8
Emby.Dlna/Service/BaseControlHandler.cs

@@ -1,17 +1,14 @@
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
-using Emby.Dlna.Server;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
 using Emby.Dlna.Didl;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Model.Xml;
-using MediaBrowser.Model.Extensions;
+using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Service
 {
@@ -205,7 +202,7 @@ namespace Emby.Dlna.Service
             return result;
         }
 
-        private void ParseFirstBodyChild(XmlReader reader, IDictionary<string,string> headers)
+        private void ParseFirstBodyChild(XmlReader reader, IDictionary<string, string> headers)
         {
             reader.MoveToContent();
             reader.Read();
@@ -229,7 +226,7 @@ namespace Emby.Dlna.Service
         {
             public string LocalName;
             public string NamespaceURI;
-            public IDictionary<string, string> Headers = new Dictionary<string,string>(StringComparer.OrdinalIgnoreCase);
+            public IDictionary<string, string> Headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
 
         protected abstract IEnumerable<KeyValuePair<string, string>> GetResult(string methodName, IDictionary<string, string> methodParams);

+ 2 - 3
Emby.Dlna/Service/BaseService.cs

@@ -1,6 +1,5 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Dlna;
-using Emby.Dlna.Eventing;
+using Emby.Dlna.Eventing;
+using MediaBrowser.Common.Net;
 using Microsoft.Extensions.Logging;
 
 namespace Emby.Dlna.Service

+ 1 - 2
Emby.Dlna/Service/ControlErrorHandler.cs

@@ -1,5 +1,4 @@
-using MediaBrowser.Controller.Dlna;
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Xml;

+ 1 - 2
Emby.Dlna/Service/ServiceXmlBuilder.cs

@@ -1,7 +1,6 @@
-using Emby.Dlna.Common;
 using System.Collections.Generic;
-using System.Security;
 using System.Text;
+using Emby.Dlna.Common;
 using Emby.Dlna.Server;
 
 namespace Emby.Dlna.Service

+ 3 - 10
Emby.Dlna/Ssdp/DeviceDiscovery.cs

@@ -1,19 +1,12 @@
-using MediaBrowser.Common.Events;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Dlna;
-using Microsoft.Extensions.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Threading;
+using Microsoft.Extensions.Logging;
 using Rssdp;
 using Rssdp.Infrastructure;
 

+ 1 - 4
Emby.Dlna/Ssdp/Extensions.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Net;
-using System.Threading.Tasks;
-using System.Xml.Linq;
+using System.Xml.Linq;
 
 namespace Emby.Dlna.Ssdp
 {