sync model

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))

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; }

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -530,12 +530,6 @@ namespace MediaBrowser.Model.Dto
         /// <value>The primary image aspect ratio.</value>
         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>
@@ -560,6 +554,12 @@ namespace MediaBrowser.Model.Dto
         /// <value>The type of the collection.</value>
         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>

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; }
     }
 }

MediaBrowser.Model/Dto/UserDto.cs

@@ -122,12 +122,6 @@ namespace MediaBrowser.Model.Dto
         /// <value>The primary image aspect ratio.</value>
         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>

MediaBrowser.Model/LiveTv/ChannelInfoDto.cs

@@ -105,12 +105,6 @@ namespace MediaBrowser.Model.LiveTv
         /// <value>The primary image aspect ratio.</value>
         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>

MediaBrowser.Model/Querying/ItemFields.cs

@@ -165,11 +165,6 @@
         /// </summary>
         PrimaryImageAspectRatio,
 
-        /// <summary>
-        /// The original primary image aspect ratio
-        /// </summary>
-        OriginalPrimaryImageAspectRatio,
-        
         /// <summary>
         /// The revenue
         /// </summary>

MediaBrowser.Model/Session/GeneralCommandType.cs

@@ -34,6 +34,8 @@
         DisplayContent = 26,
         GoToSearch = 27,
         DisplayMessage = 28,
-        SetRepeatMode = 29
+        SetRepeatMode = 29,
+        ChannelUp = 30,
+        ChannelDown = 31
     }
 }