Cleanup

qController.Standard/Classes/Communication/QController.cs

@@ -3,10 +3,7 @@
 //Also contains the local QWorkspace object which stores all the information that is used in displaying
 //STILL NEED TO WORK ON PASSWORD PROTECTED WORKSPACES
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Diagnostics;
-using Xamarin.Forms;
 
 namespace qController
 {
@@ -15,7 +12,7 @@ namespace qController
 
         public QUpdater qUpdater;
         public QClient qClient;
-        public QWorkSpace qWorkspace;
+        public QWorkspace qWorkspace;
         public string playbackPosition;
         public Stopwatch sw;
 		public QController(string address, int port)
@@ -23,19 +20,15 @@ namespace qController
             qClient = new QClient(address, port);
             qUpdater = new QUpdater(this);
 
-            //Connect();
-            //Connect();
-            //KickOff();
-
         }
 
         public void Connect(string workspace_id)
         {
             Console.WriteLine("QCONTROLLER CONNECT CALLED: " + workspace_id);
-            qWorkspace = new QWorkSpace();
+            qWorkspace = new QWorkspace();
             qWorkspace.workspace_id = workspace_id;
             qUpdater.Start();
-            qClient.sendStringUDP("/connect");
+            qClient.sendArgsUDP("/workspace/"+workspace_id+"/connect");
             qClient.sendArgsUDP("/workspace/"+workspace_id+"/updates", 1);
             qClient.sendAndReceiveString("/workspace/"+workspace_id+"/cueLists");
         }
@@ -47,17 +40,19 @@ namespace qController
 
         public void Disconnect()
         {
-            qClient.sendStringUDP("/disconnect");
+            qClient.sendStringUDP("/workspace/"+qWorkspace.workspace_id+"/disconnect");
         }
 
         public void ConnectWithPass(string pass)
         {
-            qClient.sendArgsUDP("/connect", pass);
+            qClient.sendArgsUDP("/workspace/" + qWorkspace.workspace_id + "/connect", pass);
         }
 
         public void Kill(){
-            qUpdater.Kill();
-            qClient.Close();
+            if (qUpdater != null)
+                qUpdater.Kill();
+            if (qClient != null)
+                qClient.Close();
         }
     }
 }