simplify message parsing

2 files changed, 14 insertions, 13 deletions

diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
index 9dcb679f4..583b8809d 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SharpWebSocket.cs
@@ -65,9 +65,10 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
         void socket_OnMessage(object sender, SocketHttpListener.MessageEventArgs e)
         {
-            if (OnReceive != null)
+            if (OnReceiveBytes != null)
             {
                 OnReceiveBytes(e.RawData);
+                //OnReceive(e.Data);
             }
         }
 
diff --git a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
index 9f75d522c..08e4c2ec2 100644
--- a/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
+++ b/MediaBrowser.Server.Implementations/ServerManager/WebSocketConnection.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Events;
+using System.Text;
+using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.Net;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Net;
@@ -122,22 +123,21 @@ namespace MediaBrowser.Server.Implementations.ServerManager
             }
             try
             {
-                WebSocketMessageInfo info;
-
+                //_logger.Debug(Encoding.UTF8.GetString(bytes));
                 using (var memoryStream = new MemoryStream(bytes))
                 {
-                    var stub = (WebSocketMessage<object>)_jsonSerializer.DeserializeFromStream(memoryStream, typeof(WebSocketMessage<object>));
+                    var info = (WebSocketMessageInfo)_jsonSerializer.DeserializeFromStream(memoryStream, typeof(WebSocketMessageInfo));
 
-                    info = new WebSocketMessageInfo
-                    {
-                        MessageType = stub.MessageType,
-                        Data = stub.Data == null ? null : stub.Data.ToString()
-                    };
-                }
+                    //info = new WebSocketMessageInfo
+                    //{
+                    //    MessageType = stub.MessageType,
+                    //    Data = stub.Data == null ? null : stub.Data.ToString()
+                    //};
+                    info.Connection = this;
 
-                info.Connection = this;
+                    OnReceive(info);
+                }
 
-                OnReceive(info);
             }
             catch (Exception ex)
             {