From 58728f2007c4cb21657540a7fd7c81bac6df4891 Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Sat, 6 Jun 2020 12:44:08 -0500
Subject: [PATCH] Cleanup

---
 .../Classes/Communication/QFinder.cs          |  1 +
 .../Classes/Communication/QReceiver.cs        | 64 -------------------
 .../{QItems => Settings}/NoQCueSelected.cs    |  5 +-
 3 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 qController.Standard/Classes/Communication/QReceiver.cs
 rename qController.Standard/Classes/{QItems => Settings}/NoQCueSelected.cs (83%)

diff --git a/qController.Standard/Classes/Communication/QFinder.cs b/qController.Standard/Classes/Communication/QFinder.cs
index c81902a..3a8e0e4 100644
--- a/qController.Standard/Classes/Communication/QFinder.cs
+++ b/qController.Standard/Classes/Communication/QFinder.cs
@@ -1,5 +1,6 @@
 //Currently unused would like to reimplement eventually
 //Currently being done in qConnectionPage.xaml.cs Scan() method
+//TODO: Implement this along with a way of getting active Instances and # of workspaces for an instance
 using Serilog;
 using System.Collections.Generic;
 using Zeroconf;
diff --git a/qController.Standard/Classes/Communication/QReceiver.cs b/qController.Standard/Classes/Communication/QReceiver.cs
deleted file mode 100644
index 15f0865..0000000
--- a/qController.Standard/Classes/Communication/QReceiver.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-//Class used for receiving workspace update messages (UDP)
-using SharpOSC;
-using System.Threading;
-using Serilog;
-
-namespace qController.Communication
-{
-    public class QReceiver
-    {
-        public delegate void UpdateMessageReceivedHandler(object source, MessageEventArgs args);
-        public event UpdateMessageReceivedHandler UpdateMessageReceived;
-
-        static Thread thread;
-        static UDPListener udpListener;
-        static int Port;
-        public QReceiver(int port)
-        {
-            Port = port;
-            udpListener = new UDPListener(port);
-            thread = new Thread(new ThreadStart(ListenLoop));
-            thread.Start();
-
-        }
-
-		public void ListenLoop()
-		{
-            /*
-            HandleOscPacket callback = delegate (OscPacket packet)
-            {
-                var messageReceived = (OscMessage)packet;
-                if (messageReceived != null)
-                    OnUpdateMessageReceived(messageReceived);
-                else
-                    Log.Debug("Message came back null");
-            };
-
-            udpListener = new UDPListener(Port, callback);
-            */
-            while (true)
-            {
-                OscMessage messageReceived = null;
-                while(messageReceived == null)
-                {
-                    messageReceived = (OscMessage)udpListener.Receive();
-                    Thread.Sleep(1);
-                }
-                OnUpdateMessageReceived(messageReceived);
-            }           
-
-        }
-
-        public void Close(){
-
-            thread.Abort();
-            udpListener.Close();
-        }
-
-        protected virtual void OnUpdateMessageReceived(OscMessage msg)
-        {
-            if (UpdateMessageReceived != null)
-                UpdateMessageReceived(this, new MessageEventArgs() { Message = msg });
-        }
-    }
-}
diff --git a/qController.Standard/Classes/QItems/NoQCueSelected.cs b/qController.Standard/Classes/Settings/NoQCueSelected.cs
similarity index 83%
rename from qController.Standard/Classes/QItems/NoQCueSelected.cs
rename to qController.Standard/Classes/Settings/NoQCueSelected.cs
index ee384dd..8cd0170 100644
--- a/qController.Standard/Classes/QItems/NoQCueSelected.cs
+++ b/qController.Standard/Classes/Settings/NoQCueSelected.cs
@@ -1,5 +1,6 @@
-using System;
-namespace qController.QItems
+using qController.QItems;
+
+namespace qController
 {
     public class NoQCueSelected : QCue
     {