From a201eb060b7da8d95892d5cae3d70a24596e27c7 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Sat, 18 Aug 2012 13:01:09 -0400
Subject: [PATCH] Updated reactive extensions usage to reflect new changes

---
 .../MediaBrowser.Common.csproj                |  1 -
 MediaBrowser.Common/Net/HttpServer.cs         |  3 +--
 MediaBrowser.Common/Net/StreamExtensions.cs   | 19 -------------------
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 MediaBrowser.Common/Net/StreamExtensions.cs

diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 6d7037e222..691787f1cd 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -81,7 +81,6 @@
     <Compile Include="Net\Handlers\BaseJsonHandler.cs" />
     <Compile Include="Net\HttpServer.cs" />
     <Compile Include="Net\Request.cs" />
-    <Compile Include="Net\StreamExtensions.cs" />
     <Compile Include="Plugins\BasePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Serialization\XmlSerializer.cs" />
diff --git a/MediaBrowser.Common/Net/HttpServer.cs b/MediaBrowser.Common/Net/HttpServer.cs
index 9acccbf2d2..69ded6f816 100644
--- a/MediaBrowser.Common/Net/HttpServer.cs
+++ b/MediaBrowser.Common/Net/HttpServer.cs
@@ -20,8 +20,7 @@ namespace MediaBrowser.Common.Net
         private IObservable<HttpListenerContext> ObservableHttpContext()
         {
             return Observable.Create<HttpListenerContext>(obs =>
-                                Observable.FromAsyncPattern<HttpListenerContext>(listener.BeginGetContext,
-                                                                                 listener.EndGetContext)()
+                                Observable.FromAsync<HttpListenerContext>(() => listener.GetContextAsync())
                                           .Subscribe(obs))
                              .Repeat()
                              .Retry()
diff --git a/MediaBrowser.Common/Net/StreamExtensions.cs b/MediaBrowser.Common/Net/StreamExtensions.cs
deleted file mode 100644
index c10e458ada..0000000000
--- a/MediaBrowser.Common/Net/StreamExtensions.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.IO;
-using System.Reactive.Linq;
-
-namespace MediaBrowser.Common.Net
-{
-    public static class StreamExtensions
-    {
-        public static IObservable<byte[]> ReadBytes(this Stream stream, int count)
-        {
-            var buffer = new byte[count];
-            return Observable.FromAsyncPattern((cb, state) => stream.BeginRead(buffer, 0, count, cb, state), ar =>
-            {
-                stream.EndRead(ar);
-                return buffer;
-            })();
-        }
-    }
-}
\ No newline at end of file