sync model

8 files changed, 15 insertions, 30 deletions

diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
index b5a1a7b49..f9af0fa4e 100644
--- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs
+++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs
@@ -42,6 +42,11 @@ namespace MediaBrowser.Model.ApiClient
                     existing.DateLastAccessed = server.DateLastAccessed;
                 }
 
+                if (server.DateLastLocalConnection > existing.DateLastLocalConnection)
+                {
+                    existing.DateLastLocalConnection = server.DateLastLocalConnection;
+                }
+                
                 existing.UserLinkType = server.UserLinkType;
 
                 if (!string.IsNullOrEmpty(server.AccessToken))
diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs
index e1fa581d7..53ae5be52 100644
--- a/MediaBrowser.Model/ApiClient/ServerInfo.cs
+++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs
@@ -19,6 +19,7 @@ namespace MediaBrowser.Model.ApiClient
         public String AccessToken { get; set; }
         public List<WakeOnLanInfo> WakeOnLanInfos { get; set; }
         public DateTime DateLastAccessed { get; set; }
+        public DateTime DateLastLocalConnection { get; set; }
         public String ExchangeToken { get; set; }
         public UserLinkType? UserLinkType { get; set; }
         public ConnectionMode? LastConnectionMode { get; set; }
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index ff67db1b6..935d280cd 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -531,12 +531,6 @@ namespace MediaBrowser.Model.Dto
         public double? PrimaryImageAspectRatio { get; set; }
 
         /// <summary>
-        /// Gets or sets the primary image aspect ratio, before image enhancements.
-        /// </summary>
-        /// <value>The original primary image aspect ratio.</value>
-        public double? OriginalPrimaryImageAspectRatio { get; set; }
-
-        /// <summary>
         /// Gets or sets the artists.
         /// </summary>
         /// <value>The artists.</value>
@@ -561,6 +555,12 @@ namespace MediaBrowser.Model.Dto
         public string CollectionType { get; set; }
 
         /// <summary>
+        /// Gets or sets the type of the original collection.
+        /// </summary>
+        /// <value>The type of the original collection.</value>
+        public string OriginalCollectionType { get; set; }
+        
+        /// <summary>
         /// Gets or sets the display order.
         /// </summary>
         /// <value>The display order.</value>
diff --git a/MediaBrowser.Model/Dto/IItemDto.cs b/MediaBrowser.Model/Dto/IItemDto.cs
index af46d29b9..3e7d1c608 100644
--- a/MediaBrowser.Model/Dto/IItemDto.cs
+++ b/MediaBrowser.Model/Dto/IItemDto.cs
@@ -11,11 +11,5 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The primary image aspect ratio.</value>
         double? PrimaryImageAspectRatio { get; set; }
-
-        /// <summary>
-        /// Gets or sets the original primary image aspect ratio.
-        /// </summary>
-        /// <value>The original primary image aspect ratio.</value>
-        double? OriginalPrimaryImageAspectRatio { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index fc5d2f134..f133f3343 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -123,12 +123,6 @@ namespace MediaBrowser.Model.Dto
         public double? PrimaryImageAspectRatio { get; set; }
 
         /// <summary>
-        /// Gets or sets the original primary image aspect ratio.
-        /// </summary>
-        /// <value>The original primary image aspect ratio.</value>
-        public double? OriginalPrimaryImageAspectRatio { get; set; }
-
-        /// <summary>
         /// Gets a value indicating whether this instance has primary image.
         /// </summary>
         /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index fd901f29e..91493def8 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -106,12 +106,6 @@ namespace MediaBrowser.Model.LiveTv
         public double? PrimaryImageAspectRatio { get; set; }
 
         /// <summary>
-        /// Gets or sets the primary image aspect ratio, before image enhancements.
-        /// </summary>
-        /// <value>The original primary image aspect ratio.</value>
-        public double? OriginalPrimaryImageAspectRatio { get; set; }
-
-        /// <summary>
         /// Gets a value indicating whether this instance has primary image.
         /// </summary>
         /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index eea561f72..e8b1414b7 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -166,11 +166,6 @@
         PrimaryImageAspectRatio,
 
         /// <summary>
-        /// The original primary image aspect ratio
-        /// </summary>
-        OriginalPrimaryImageAspectRatio,
-        
-        /// <summary>
         /// The revenue
         /// </summary>
         Revenue,
diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs
index 79220f066..64b61678e 100644
--- a/MediaBrowser.Model/Session/GeneralCommandType.cs
+++ b/MediaBrowser.Model/Session/GeneralCommandType.cs
@@ -34,6 +34,8 @@
         DisplayContent = 26,
         GoToSearch = 27,
         DisplayMessage = 28,
-        SetRepeatMode = 29
+        SetRepeatMode = 29,
+        ChannelUp = 30,
+        ChannelDown = 31
     }
 }
\ No newline at end of file