Fix a few

Author: sta

Example/AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("sta")]
+[assembly: AssemblyCopyright("sta.blockhead")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -24,4 +24,3 @@
 
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
-

Example/NotificationMessage.cs

@@ -4,10 +4,6 @@ namespace Example
 {
   internal class NotificationMessage
   {
-    public NotificationMessage ()
-    {
-    }
-
     public string Body {
       get; set;
     }
@@ -22,7 +18,7 @@ public string Summary {
 
     public override string ToString ()
     {
-      return String.Format ("[{0}: {1}]", Summary, Body);
+      return String.Format ("{0}: {1}", Summary, Body);
     }
   }
 }

Example/Program.cs

@@ -26,23 +26,23 @@ public static void Main (string [] args)
 
         ws.OnMessage += (sender, e) =>
           nf.Notify (
-            new NotificationMessage () {
+            new NotificationMessage {
               Summary = "WebSocket Message",
               Body = e.Data,
               Icon = "notification-message-im"
             });
 
         ws.OnError += (sender, e) =>
           nf.Notify (
-            new NotificationMessage () {
+            new NotificationMessage {
               Summary = "WebSocket Error",
               Body = e.Message,
               Icon = "notification-message-im"
             });
 
         ws.OnClose += (sender, e) =>
           nf.Notify (
-            new NotificationMessage () {
+            new NotificationMessage {
               Summary = String.Format ("WebSocket Close ({0})", e.Code),
               Body = e.Reason,
               Icon = "notification-message-im"
@@ -51,7 +51,6 @@ public static void Main (string [] args)
 #if DEBUG
         ws.Log.Level = LogLevel.Trace;
 #endif
-
         // Per-message Compression
         //ws.Compression = CompressionMethod.Deflate;
 
@@ -80,9 +79,8 @@ public static void Main (string [] args)
           Thread.Sleep (500);
           Console.Write ("> ");
           var msg = Console.ReadLine ();
-          if (msg == "exit") {
+          if (msg == "exit")
             break;
-          }
 
           ws.Send (msg);
         }

Example1/AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("sta")]
+[assembly: AssemblyCopyright("sta.blockhead")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -24,4 +24,3 @@
 
 //[assembly: AssemblyDelaySign(false)]
 //[assembly: AssemblyKeyFile("")]
-

Example1/AudioStreamer.cs

@@ -31,18 +31,18 @@ public AudioStreamer (string url)
       configure ();
     }
 
-    private AudioMessage acceptBinaryMessage (byte [] value)
+    private AudioMessage acceptBinaryMessage (byte [] data)
     {
-      var id = value.SubArray (0, 4).To<uint> (ByteOrder.Big);
-      var chNum = value.SubArray (4, 1) [0];
-      var bufferLength = value.SubArray (5, 4).To<uint> (ByteOrder.Big);
+      var id = data.SubArray (0, 4).To<uint> (ByteOrder.Big);
+      var chNum = data.SubArray (4, 1) [0];
+      var bufferLength = data.SubArray (5, 4).To<uint> (ByteOrder.Big);
       var bufferArray = new float [chNum, bufferLength];
 
       var offset = 9;
       ((int) chNum).Times (
         i => bufferLength.Times (
           j => {
-            bufferArray [i, j] = value.SubArray (offset, 4).To<float> (ByteOrder.Big);
+            bufferArray [i, j] = data.SubArray (offset, 4).To<float> (ByteOrder.Big);
             offset += 4;
           }));
 
@@ -54,37 +54,37 @@ private AudioMessage acceptBinaryMessage (byte [] value)
       };
     }
 
-    private NotificationMessage acceptTextMessage (string value)
+    private NotificationMessage acceptTextMessage (string data)
     {
-      var json = JObject.Parse (value);
+      var json = JObject.Parse (data);
       var id = (uint) json ["user_id"];
       var name = (string) json ["name"];
       var type = (string) json ["type"];
 
       string message;
-      if (type == "connection") {
+      if (type == "message")
+        message = String.Format ("{0}: {1}", name, (string) json ["message"]);
+      else if (type == "start_music")
+        message = String.Format ("{0}: Started playing music!", name);
+      else if (type == "connection") {
         var users = (JArray) json ["message"];
-        var msg = new StringBuilder ("Now keeping connection:");
+        var msg = new StringBuilder ("Now keeping connections:");
         foreach (JToken user in users)
           msg.AppendFormat (
             "\n- user_id: {0} name: {1}", (uint) user ["user_id"], (string) user ["name"]);
 
         message = msg.ToString ();
       }
       else if (type == "connected") {
-        _heartbeatTimer.Change (30000, 30000);
         _id = id;
+        _heartbeatTimer.Change (30000, 30000);
         message = String.Format ("user_id: {0} name: {1}", id, name);
       }
-      else if (type == "message")
-        message = String.Format ("{0}: {1}", name, (string) json ["message"]);
-      else if (type == "start_music")
-        message = String.Format ("{0}: Started playing music!", name);
       else
         message = "Received unknown type message.";
 
       return new NotificationMessage {
-        Summary = String.Format ("AudioStreamer Message ({0})", type),
+        Summary = String.Format ("AudioStreamer ({0})", type),
         Body = message,
         Icon = "notification-message-im"
       };
@@ -120,16 +120,16 @@ private void configure ()
       _websocket.OnError += (sender, e) =>
         _notifier.Notify (
           new NotificationMessage {
-            Summary = "AudioStreamer Error",
+            Summary = "AudioStreamer (error)",
             Body = e.Message,
             Icon = "notification-message-im"
           });
 
       _websocket.OnClose += (sender, e) =>
         _notifier.Notify (
           new NotificationMessage {
-            Summary = String.Format ("AudioStreamer Disconnect ({0})", e.Code),
-            Body = e.Reason,
+            Summary = "AudioStreamer (disconnect)",
+            Body = String.Format ("code: {0} reason: {1}", e.Code, e.Reason),
             Icon = "notification-message-im"
           });
     }
@@ -169,25 +169,19 @@ private void sendHeartbeat (object state)
       _websocket.Send (createTextMessage ("heartbeat", String.Empty));
     }
 
-    public void Connect ()
+    public void Connect (string username)
     {
-      do {
-        Console.Write ("Input your name> ");
-        _name = Console.ReadLine ();
-      }
-      while (_name.Length == 0);
-
+      _name = username;
       _websocket.Connect ();
     }
 
     public void Disconnect ()
     {
-      var wait = new ManualResetEvent (false);
-      _heartbeatTimer.Dispose (wait);
-      wait.WaitOne ();
-
-      _websocket.Close ();
-      _notifier.Close ();
+      _heartbeatTimer.Change (-1, -1);
+      _websocket.Close (CloseStatusCode.Away);
+      _audioBox.Clear ();
+      _id = null;
+      _name = null;
     }
 
     public void Write (string message)
@@ -198,6 +192,9 @@ public void Write (string message)
     void IDisposable.Dispose ()
     {
       Disconnect ();
+
+      _heartbeatTimer.Dispose ();
+      _notifier.Close ();
     }
   }
 }

Example1/Program.cs

@@ -10,7 +10,14 @@ public static void Main (string [] args)
       using (var streamer = new AudioStreamer ("ws://agektmr.node-ninja.com:3000/socket"))
       //using (var streamer = new AudioStreamer ("ws://localhost:3000/socket"))
       {
-        streamer.Connect ();
+        string name;
+        do {
+          Console.Write ("Input your name> ");
+          name = Console.ReadLine ();
+        }
+        while (name.Length == 0);
+
+        streamer.Connect (name);
 
         Console.WriteLine ("\nType \"exit\" to exit.\n");
         while (true) {