From 132ec37d94e7e1e72e18f7a0051dc5e88f6bacae Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Thu, 28 Jul 2016 15:31:04 +0900
Subject: [PATCH] [Modify] Polish it

---
 Example1/AudioStreamer.cs | 75 ++++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/Example1/AudioStreamer.cs b/Example1/AudioStreamer.cs
index f7fc0b3c..ea10aac0 100644
--- a/Example1/AudioStreamer.cs
+++ b/Example1/AudioStreamer.cs
@@ -40,7 +40,7 @@ namespace Example1
 
       _websocket.OnMessage += (sender, e) => {
           if (e.IsText) {
-            _notifier.Notify (convertToNotificationMessage (e.Data));
+            _notifier.Notify (processTextMessage (e.Data));
             return;
           }
 
@@ -108,9 +108,43 @@ namespace Example1
              };
     }
 
-    private NotificationMessage convertToNotificationMessage (string textMessage)
+    private byte[] createBinaryMessage (float[,] bufferArray)
     {
-      var json = JObject.Parse (textMessage);
+      var msg = new List<byte> ();
+
+      var id = (uint) _id;
+      var chNum = bufferArray.GetLength (0);
+      var buffLen = bufferArray.GetLength (1);
+
+      msg.AddRange (id.ToByteArray (ByteOrder.Big));
+      msg.Add ((byte) chNum);
+      msg.AddRange (((uint) buffLen).ToByteArray (ByteOrder.Big));
+
+      chNum.Times (
+        i =>
+          buffLen.Times (
+            j => msg.AddRange (bufferArray[i, j].ToByteArray (ByteOrder.Big))
+          )
+      );
+
+      return msg.ToArray ();
+    }
+
+    private string createTextMessage (string type, string message)
+    {
+      return JsonConvert.SerializeObject (
+               new TextMessage {
+                 user_id = _id,
+                 name = _name,
+                 type = type,
+                 message = message
+               }
+             );
+    }
+
+    private NotificationMessage processTextMessage (string data)
+    {
+      var json = JObject.Parse (data);
       var id = (uint) json["user_id"];
       var name = (string) json["name"];
       var type = (string) json["type"];
@@ -136,6 +170,7 @@ namespace Example1
       else if (type == "connected") {
         _id = id;
         _timer.Change (30000, 30000);
+
         body = String.Format ("user_id: {0} name: {1}", id, name);
       }
       else {
@@ -149,40 +184,6 @@ namespace Example1
              };
     }
 
-    private byte[] createBinaryMessage (float[,] bufferArray)
-    {
-      var msg = new List<byte> ();
-
-      var id = (uint) _id;
-      var chNum = bufferArray.GetLength (0);
-      var buffLen = bufferArray.GetLength (1);
-
-      msg.AddRange (id.ToByteArray (ByteOrder.Big));
-      msg.Add ((byte) chNum);
-      msg.AddRange (((uint) buffLen).ToByteArray (ByteOrder.Big));
-
-      chNum.Times (
-        i =>
-          buffLen.Times (
-            j => msg.AddRange (bufferArray[i, j].ToByteArray (ByteOrder.Big))
-          )
-      );
-
-      return msg.ToArray ();
-    }
-
-    private string createTextMessage (string type, string message)
-    {
-      return JsonConvert.SerializeObject (
-               new TextMessage {
-                 user_id = _id,
-                 name = _name,
-                 type = type,
-                 message = message
-               }
-             );
-    }
-
     private void sendHeartbeat (object state)
     {
       _websocket.Send (createTextMessage ("heartbeat", String.Empty));