aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs2
-rw-r--r--MediaBrowser.Model/Connectivity/ClientType.cs41
-rw-r--r--MediaBrowser.Model/Entities/DisplayPreferences.cs33
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj1
4 files changed, 2 insertions, 75 deletions
diff --git a/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs b/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs
index a70dddaa6..565ce6ec2 100644
--- a/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs
+++ b/MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Model.Connectivity
/// </summary>
/// <value>The type of the client.</value>
[ProtoMember(2)]
- public ClientType ClientType { get; set; }
+ public string Client { get; set; }
/// <summary>
/// Gets or sets the last activity date.
diff --git a/MediaBrowser.Model/Connectivity/ClientType.cs b/MediaBrowser.Model/Connectivity/ClientType.cs
deleted file mode 100644
index 3ae3ded21..000000000
--- a/MediaBrowser.Model/Connectivity/ClientType.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-namespace MediaBrowser.Model.Connectivity
-{
- /// <summary>
- /// Enum ClientType
- /// </summary>
- public enum ClientType
- {
- /// <summary>
- /// The other
- /// </summary>
- Other,
- /// <summary>
- /// The android
- /// </summary>
- Android,
- /// <summary>
- /// The dashboard
- /// </summary>
- Dashboard,
- /// <summary>
- /// The dlna
- /// </summary>
- Dlna,
- /// <summary>
- /// The ios
- /// </summary>
- Ios,
- /// <summary>
- /// The pc
- /// </summary>
- Pc,
- /// <summary>
- /// The windows phone
- /// </summary>
- WindowsPhone,
- /// <summary>
- /// The windows RT
- /// </summary>
- WindowsRT
- }
-}
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 2fe4ae564..7331da86d 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -21,8 +21,6 @@ namespace MediaBrowser.Model.Entities
/// </summary>
public DisplayPreferences()
{
- ViewType = ViewTypes.Poster;
- PrimaryImageType = ImageType.Primary;
RememberIndexing = false;
PrimaryImageHeight = 250;
PrimaryImageWidth = 250;
@@ -40,13 +38,7 @@ namespace MediaBrowser.Model.Entities
/// </summary>
/// <value>The type of the view.</value>
[ProtoMember(2)]
- public ViewTypes ViewType { get; set; }
- /// <summary>
- /// Gets or sets the type of the primary image.
- /// </summary>
- /// <value>The type of the primary image.</value>
- [ProtoMember(3)]
- public ImageType PrimaryImageType { get; set; }
+ public string ViewType { get; set; }
/// <summary>
/// Gets or sets the sort by.
/// </summary>
@@ -128,29 +120,6 @@ namespace MediaBrowser.Model.Entities
}
/// <summary>
- /// Enum ViewTypes
- /// </summary>
- public enum ViewTypes
- {
- /// <summary>
- /// The poster
- /// </summary>
- Poster,
- /// <summary>
- /// The cover flow
- /// </summary>
- CoverFlow,
- /// <summary>
- /// The thumb strip
- /// </summary>
- ThumbStrip,
- /// <summary>
- /// The list
- /// </summary>
- List
- }
-
- /// <summary>
/// Enum ScrollDirection
/// </summary>
public enum ScrollDirection
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 5f76c49ca..a3bc341c3 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -49,7 +49,6 @@
<Compile Include="Querying\ItemsByNameQuery.cs" />
<Compile Include="Entities\BaseItemInfo.cs" />
<Compile Include="Connectivity\ClientConnectionInfo.cs" />
- <Compile Include="Connectivity\ClientType.cs" />
<Compile Include="Entities\ImageDownloadOptions.cs" />
<Compile Include="Logging\ILogManager.cs" />
<Compile Include="MediaInfo\BlurayDiscInfo.cs" />