alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-13 05:36:36 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'official/master'

Browse Source
This commit is contained in:
Michalis Adamidis
2014-08-06 01:29:56 +02:00
parent a118169a3c 7e25c857a5
commit 7994f0dcd9
114 changed files with 2756 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Common.Implementations/Serialization/JsonSerializer.cs
View File

@@ -210,25 +210,5 @@ namespace MediaBrowser.Common.Implementations.Serialization
return ServiceStack.Text.JsonSerializer.SerializeToString(obj, obj.GetType());
}
/// <summary>
/// Serializes to bytes.
/// </summary>
/// <param name="obj">The obj.</param>
/// <returns>System.Byte[][].</returns>
/// <exception cref="System.ArgumentNullException">obj</exception>
public byte[] SerializeToBytes(object obj)
{
if (obj == null)
{
throw new ArgumentNullException("obj");
}
using (var stream = new MemoryStream())
{
SerializeToStream(obj, stream);
return stream.ToArray();
}
}
}
}

15
MediaBrowser.Common.Implementations/Serialization/XmlSerializer.cs
View File

@@ -91,20 +91,5 @@ namespace MediaBrowser.Common.Implementations.Serialization
return DeserializeFromStream(type, stream);
}
}
/// <summary>
/// Serializes to bytes.
/// </summary>
/// <param name="obj">The obj.</param>
/// <returns>System.Byte[][].</returns>
public byte[] SerializeToBytes(object obj)
{
using (var stream = new MemoryStream())
{
SerializeToStream(obj, stream);
return stream.ToArray();
}
}
}
}