aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Common/Serialization/JsonSerializer.cs
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-09-03 17:56:30 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-09-03 17:56:30 -0400
commitfc735e918723f5bfdd64979afa4995a6fec80e7c (patch)
tree7777e8f0954a29953ed64beb79f4f58c5bda6aab /MediaBrowser.Common/Serialization/JsonSerializer.cs
parent7f8a4772786ed32781eab011cedb3260c9e2dd33 (diff)
Tweaked plugin downloading a bit
Diffstat (limited to 'MediaBrowser.Common/Serialization/JsonSerializer.cs')
-rw-r--r--MediaBrowser.Common/Serialization/JsonSerializer.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/MediaBrowser.Common/Serialization/JsonSerializer.cs b/MediaBrowser.Common/Serialization/JsonSerializer.cs
index e73048f17..b1c0726e5 100644
--- a/MediaBrowser.Common/Serialization/JsonSerializer.cs
+++ b/MediaBrowser.Common/Serialization/JsonSerializer.cs
@@ -52,6 +52,13 @@ namespace MediaBrowser.Common.Serialization
return ServiceStack.Text.JsonSerializer.DeserializeFromStream<T>(stream);
}
+ public static object DeserializeFromStream(Stream stream, Type type)
+ {
+ Configure();
+
+ return ServiceStack.Text.JsonSerializer.DeserializeFromStream(type, stream);
+ }
+
private static bool IsConfigured = false;
private static void Configure()
{