Merge branch 'master' into master

1 files changed, 5 insertions, 3 deletions

diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 7e8949e1f..8f223c12a 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-using Jellyfin.Data.Entities;
+using System.ComponentModel;
 using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Library;
@@ -550,7 +551,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the parent primary image item identifier.
         /// </summary>
         /// <value>The parent primary image item identifier.</value>
-        public string ParentPrimaryImageItemId { get; set; }
+        public Guid? ParentPrimaryImageItemId { get; set; }
 
         /// <summary>
         /// Gets or sets the parent primary image tag.
@@ -568,7 +569,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the trickplay manifest.
         /// </summary>
         /// <value>The trickplay manifest.</value>
-        public Dictionary<string, Dictionary<int, TrickplayInfo>> Trickplay { get; set; }
+        public Dictionary<string, Dictionary<int, TrickplayInfoDto>> Trickplay { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the location.
@@ -586,6 +587,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the type of the media.
         /// </summary>
         /// <value>The type of the media.</value>
+        [DefaultValue(MediaType.Unknown)]
         public MediaType MediaType { get; set; }
 
         /// <summary>