aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Dlna/DeviceIdentification.cs56
-rw-r--r--MediaBrowser.Controller/Dlna/DeviceProfile.cs32
-rw-r--r--MediaBrowser.Controller/Dlna/IDlnaManager.cs9
-rw-r--r--MediaBrowser.Controller/MediaBrowser.Controller.csproj1
4 files changed, 66 insertions, 32 deletions
diff --git a/MediaBrowser.Controller/Dlna/DeviceIdentification.cs b/MediaBrowser.Controller/Dlna/DeviceIdentification.cs
new file mode 100644
index 000000000..a3a615516
--- /dev/null
+++ b/MediaBrowser.Controller/Dlna/DeviceIdentification.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Dlna
+{
+ public class DeviceIdentification
+ {
+ /// <summary>
+ /// Gets or sets the name of the friendly.
+ /// </summary>
+ /// <value>The name of the friendly.</value>
+ public string FriendlyName { get; set; }
+ /// <summary>
+ /// Gets or sets the model number.
+ /// </summary>
+ /// <value>The model number.</value>
+ public string ModelNumber { get; set; }
+ /// <summary>
+ /// Gets or sets the serial number.
+ /// </summary>
+ /// <value>The serial number.</value>
+ public string SerialNumber { get; set; }
+ /// <summary>
+ /// Gets or sets the name of the model.
+ /// </summary>
+ /// <value>The name of the model.</value>
+ public string ModelName { get; set; }
+ /// <summary>
+ /// Gets or sets the manufacturer.
+ /// </summary>
+ /// <value>
+ /// The manufacturer.
+ /// </value>
+ public string Manufacturer { get; set; }
+ /// <summary>
+ /// Gets or sets the manufacturer URL.
+ /// </summary>
+ /// <value>The manufacturer URL.</value>
+ public string ManufacturerUrl { get; set; }
+ /// <summary>
+ /// Gets or sets the headers.
+ /// </summary>
+ /// <value>The headers.</value>
+ public List<HttpHeaderInfo> Headers { get; set; }
+
+ public DeviceIdentification()
+ {
+ Headers = new List<HttpHeaderInfo>();
+ }
+ }
+
+ public class HttpHeaderInfo
+ {
+ public string Name { get; set; }
+ public string Value { get; set; }
+ }
+}
diff --git a/MediaBrowser.Controller/Dlna/DeviceProfile.cs b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
index f3a3bc171..119cfffd7 100644
--- a/MediaBrowser.Controller/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Controller/Dlna/DeviceProfile.cs
@@ -16,32 +16,6 @@ namespace MediaBrowser.Controller.Dlna
public string ClientType { get; set; }
/// <summary>
- /// Gets or sets the name of the friendly.
- /// </summary>
- /// <value>The name of the friendly.</value>
- public string FriendlyName { get; set; }
-
- /// <summary>
- /// Gets or sets the model number.
- /// </summary>
- /// <value>The model number.</value>
- public string ModelNumber { get; set; }
-
- /// <summary>
- /// Gets or sets the name of the model.
- /// </summary>
- /// <value>The name of the model.</value>
- public string ModelName { get; set; }
-
- /// <summary>
- /// Gets or sets the manufacturer.
- /// </summary>
- /// <value>
- /// The manufacturer.
- /// </value>
- public string Manufacturer { get; set; }
-
- /// <summary>
/// Gets or sets the transcoding profiles.
/// </summary>
/// <value>The transcoding profiles.</value>
@@ -53,6 +27,12 @@ namespace MediaBrowser.Controller.Dlna
/// <value>The direct play profiles.</value>
public DirectPlayProfile[] DirectPlayProfiles { get; set; }
+ /// <summary>
+ /// Gets or sets the identification.
+ /// </summary>
+ /// <value>The identification.</value>
+ public DeviceIdentification Identification { get; set; }
+
public DeviceProfile()
{
DirectPlayProfiles = new DirectPlayProfile[] { };
diff --git a/MediaBrowser.Controller/Dlna/IDlnaManager.cs b/MediaBrowser.Controller/Dlna/IDlnaManager.cs
index 599b42dd5..6de17e551 100644
--- a/MediaBrowser.Controller/Dlna/IDlnaManager.cs
+++ b/MediaBrowser.Controller/Dlna/IDlnaManager.cs
@@ -19,11 +19,8 @@ namespace MediaBrowser.Controller.Dlna
/// <summary>
/// Gets the profile.
/// </summary>
- /// <param name="friendlyName">Name of the friendly.</param>
- /// <param name="modelName">Name of the model.</param>
- /// <param name="modelNumber">The model number.</param>
- /// <param name="manufacturer">The manufacturer.</param>
- /// <returns>DlnaProfile.</</returns>
- DeviceProfile GetProfile(string friendlyName, string modelName, string modelNumber, string manufacturer);
+ /// <param name="deviceInfo">The device information.</param>
+ /// <returns>DeviceProfile.</returns>
+ DeviceProfile GetProfile(DeviceIdentification deviceInfo);
}
}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 7e5e6d9b0..2dc444ea9 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -73,6 +73,7 @@
<Compile Include="Channels\IChannelManager.cs" />
<Compile Include="Collections\CollectionCreationOptions.cs" />
<Compile Include="Collections\ICollectionManager.cs" />
+ <Compile Include="Dlna\DeviceIdentification.cs" />
<Compile Include="Dlna\DirectPlayProfile.cs" />
<Compile Include="Dlna\IDlnaManager.cs" />
<Compile Include="Dlna\DeviceProfile.cs" />