1 files changed, 21 insertions, 5 deletions
diff --git a/MediaBrowser.ApiInteraction/DataSerializer.cs b/MediaBrowser.ApiInteraction/DataSerializer.cs
index c455bd15ef..ae3a72e622 100644
--- a/MediaBrowser.ApiInteraction/DataSerializer.cs
+++ b/MediaBrowser.ApiInteraction/DataSerializer.cs
@@ -1,17 +1,29 @@
-using System;
+using ServiceStack.Text;
+using System;
 using System.IO;
-using ProtoBuf;
-using ServiceStack.Text;
 
 namespace MediaBrowser.ApiInteraction
 {
     public static class DataSerializer
     {
+        /// <summary>
+        /// This is an auto-generated Protobuf Serialization assembly for best performance.
+        /// It is created during the Model project's post-build event.
+        /// This means that this class can currently only handle types within the Model project.
+        /// If we need to, we can always add a param indicating whether or not the model serializer should be used.
+        /// </summary>
+        private static ProtobufModelSerializer ProtobufModelSerializer = new ProtobufModelSerializer();
+        
+        /// <summary>
+        /// Deserializes an object using generics
+        /// </summary>
         public static T DeserializeFromStream<T>(Stream stream, SerializationFormats format)
+            where T : class
         {
             if (format == ApiInteraction.SerializationFormats.Protobuf)
             {
-                return Serializer.Deserialize<T>(stream);
+                //return Serializer.Deserialize<T>(stream);
+                return ProtobufModelSerializer.Deserialize(stream, null, typeof(T)) as T;
             }
             else if (format == ApiInteraction.SerializationFormats.Jsv)
             {
@@ -25,11 +37,15 @@ namespace MediaBrowser.ApiInteraction
             throw new NotImplementedException();
         }
 
+        /// <summary>
+        /// Deserializes an object
+        /// </summary>
         public static object DeserializeFromStream(Stream stream, SerializationFormats format, Type type)
         {
             if (format == ApiInteraction.SerializationFormats.Protobuf)
             {
-                throw new NotImplementedException();
+                //throw new NotImplementedException();
+                return ProtobufModelSerializer.Deserialize(stream, null, type);
             }
             else if (format == ApiInteraction.SerializationFormats.Jsv)
             {