Merge remote-tracking branch 'official/master'

7 files changed, 32 insertions, 16 deletions

diff --git a/MediaBrowser.Model/Collections/CollectionCreationResult.cs b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
new file mode 100644
index 000000000..ad7ac9553
--- /dev/null
+++ b/MediaBrowser.Model/Collections/CollectionCreationResult.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Collections
+{
+    public class CollectionCreationResult
+    {
+        public string Id { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index d138ddf9b..9581b5740 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -594,7 +594,19 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The parent thumb image tag.</value>
         public string ParentThumbImageTag { get; set; }
-        
+
+        /// <summary>
+        /// Gets or sets the parent primary image item identifier.
+        /// </summary>
+        /// <value>The parent primary image item identifier.</value>
+        public string ParentPrimaryImageItemId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the parent primary image tag.
+        /// </summary>
+        /// <value>The parent primary image tag.</value>
+        public string ParentPrimaryImageTag { get; set; }
+
         /// <summary>
         /// Gets or sets the chapters.
         /// </summary>
diff --git a/MediaBrowser.Model/Entities/CollectionType.cs b/MediaBrowser.Model/Entities/CollectionType.cs
index 5a9526d95..31cda8303 100644
--- a/MediaBrowser.Model/Entities/CollectionType.cs
+++ b/MediaBrowser.Model/Entities/CollectionType.cs
@@ -23,5 +23,6 @@
         public const string Games = "games";
         public const string Channels = "channels";
         public const string LiveTv = "livetv";
+        public const string Playlists = "playlists";
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index efd8c2a0a..94629048c 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -75,6 +75,7 @@
     <Compile Include="Channels\ChannelQuery.cs" />
     <Compile Include="Chapters\RemoteChapterInfo.cs" />
     <Compile Include="Chapters\RemoteChapterResult.cs" />
+    <Compile Include="Collections\CollectionCreationResult.cs" />
     <Compile Include="Configuration\ChannelOptions.cs" />
     <Compile Include="Configuration\ChapterOptions.cs" />
     <Compile Include="Configuration\XbmcMetadataOptions.cs" />
@@ -204,6 +205,7 @@
     <Compile Include="Notifications\NotificationRequest.cs" />
     <Compile Include="Notifications\NotificationServiceInfo.cs" />
     <Compile Include="Notifications\NotificationTypeInfo.cs" />
+    <Compile Include="Playlists\PlaylistCreationResult.cs" />
     <Compile Include="Providers\ExternalIdInfo.cs" />
     <Compile Include="Providers\ExternalUrl.cs" />
     <Compile Include="Providers\ImageProviderInfo.cs" />
diff --git a/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
new file mode 100644
index 000000000..bbab8a18d
--- /dev/null
+++ b/MediaBrowser.Model/Playlists/PlaylistCreationResult.cs
@@ -0,0 +1,8 @@
+
+namespace MediaBrowser.Model.Playlists
+{
+    public class PlaylistCreationResult
+    {
+        public string Id { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Serialization/IJsonSerializer.cs b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
index 77a14c1e5..cd1e550e5 100644
--- a/MediaBrowser.Model/Serialization/IJsonSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IJsonSerializer.cs
@@ -83,13 +83,5 @@ namespace MediaBrowser.Model.Serialization
         /// <returns>System.String.</returns>
         /// <exception cref="System.ArgumentNullException">obj</exception>
         string SerializeToString(object obj);
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        byte[] SerializeToBytes(object obj);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Serialization/IXmlSerializer.cs b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
index 177377350..eb23d784f 100644
--- a/MediaBrowser.Model/Serialization/IXmlSerializer.cs
+++ b/MediaBrowser.Model/Serialization/IXmlSerializer.cs
@@ -42,12 +42,5 @@ namespace MediaBrowser.Model.Serialization
         /// <param name="buffer">The buffer.</param>
         /// <returns>System.Object.</returns>
         object DeserializeFromBytes(Type type, byte[] buffer);
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        byte[] SerializeToBytes(object obj);
     }
 }
\ No newline at end of file