From ce3a2b66498c628acc82232b10b5fd002d497ec4 Mon Sep 17 00:00:00 2001
From: jwetzell <jwetzell@yahoo.com>
Date: Wed, 10 Apr 2019 14:26:03 -0500
Subject: [PATCH] Revert UDPListener back to non async version

---
 Droid/packages.config                               | 12 ++++++------
 Droid/qController.Droid.csproj                      | 12 ++++++------
 iOS/packages.config                                 | 10 +++++-----
 iOS/qController.iOS.csproj                          | 10 +++++-----
 .../Classes/Communication/QReceiver.cs              | 13 +++++++++++++
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/Droid/packages.config b/Droid/packages.config
index b1dd9d2..b71e0d6 100644
--- a/Droid/packages.config
+++ b/Droid/packages.config
@@ -9,7 +9,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid71" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid81" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="monoandroid81" />
-  <package id="Splat" version="7.0.1" targetFramework="monoandroid81" />
+  <package id="Splat" version="7.0.8" targetFramework="monoandroid81" />
   <package id="System.AppContext" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.Collections" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid71" />
@@ -36,11 +36,11 @@
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid71" />
-  <package id="System.Reactive" version="4.1.3" targetFramework="monoandroid81" />
-  <package id="System.Reactive.Core" version="4.1.3" targetFramework="monoandroid81" />
-  <package id="System.Reactive.Interfaces" version="4.1.3" targetFramework="monoandroid81" />
-  <package id="System.Reactive.Linq" version="4.1.3" targetFramework="monoandroid81" />
-  <package id="System.Reactive.PlatformServices" version="4.1.3" targetFramework="monoandroid81" />
+  <package id="System.Reactive" version="4.1.5" targetFramework="monoandroid81" />
+  <package id="System.Reactive.Core" version="4.1.5" targetFramework="monoandroid81" />
+  <package id="System.Reactive.Interfaces" version="4.1.5" targetFramework="monoandroid81" />
+  <package id="System.Reactive.Linq" version="4.1.5" targetFramework="monoandroid81" />
+  <package id="System.Reactive.PlatformServices" version="4.1.5" targetFramework="monoandroid81" />
   <package id="System.Reflection" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid71" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid71" />
diff --git a/Droid/qController.Droid.csproj b/Droid/qController.Droid.csproj
index 2bef6d0..7245597 100644
--- a/Droid/qController.Droid.csproj
+++ b/Droid/qController.Droid.csproj
@@ -79,22 +79,22 @@
       <HintPath>..\packages\Acr.Settings.9.0.1\lib\monoandroid80\Acr.Settings.dll</HintPath>
     </Reference>
     <Reference Include="Splat">
-      <HintPath>..\packages\Splat.7.0.1\lib\monoandroid81\Splat.dll</HintPath>
+      <HintPath>..\packages\Splat.7.0.8\lib\monoandroid81\Splat.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive">
-      <HintPath>..\packages\System.Reactive.4.1.3\lib\netstandard2.0\System.Reactive.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.4.1.5\lib\netstandard2.0\System.Reactive.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\System.Reactive.Core.4.1.3\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.Core.4.1.5\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\System.Reactive.Interfaces.4.1.3\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.Interfaces.4.1.5\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\System.Reactive.Linq.4.1.3\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.Linq.4.1.5\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\System.Reactive.PlatformServices.4.1.3\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.PlatformServices.4.1.5\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Android.Support.Annotations">
       <HintPath>..\packages\Xamarin.Android.Support.Annotations.28.0.0.1\lib\monoandroid81\Xamarin.Android.Support.Annotations.dll</HintPath>
diff --git a/iOS/packages.config b/iOS/packages.config
index 77fdaf9..447967c 100644
--- a/iOS/packages.config
+++ b/iOS/packages.config
@@ -30,11 +30,11 @@
   <package id="System.Net.Primitives" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.Net.Sockets" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.ObjectModel" version="4.3.0" targetFramework="xamarinios10" />
-  <package id="System.Reactive" version="4.1.3" targetFramework="xamarinios10" />
-  <package id="System.Reactive.Core" version="4.1.3" targetFramework="xamarinios10" />
-  <package id="System.Reactive.Interfaces" version="4.1.3" targetFramework="xamarinios10" />
-  <package id="System.Reactive.Linq" version="4.1.3" targetFramework="xamarinios10" />
-  <package id="System.Reactive.PlatformServices" version="4.1.3" targetFramework="xamarinios10" />
+  <package id="System.Reactive" version="4.1.5" targetFramework="xamarinios10" />
+  <package id="System.Reactive.Core" version="4.1.5" targetFramework="xamarinios10" />
+  <package id="System.Reactive.Interfaces" version="4.1.5" targetFramework="xamarinios10" />
+  <package id="System.Reactive.Linq" version="4.1.5" targetFramework="xamarinios10" />
+  <package id="System.Reactive.PlatformServices" version="4.1.5" targetFramework="xamarinios10" />
   <package id="System.Reflection" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="xamarinios10" />
   <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="xamarinios10" />
diff --git a/iOS/qController.iOS.csproj b/iOS/qController.iOS.csproj
index d8c6ec9..6ea7d34 100644
--- a/iOS/qController.iOS.csproj
+++ b/iOS/qController.iOS.csproj
@@ -108,19 +108,19 @@
       <HintPath>..\packages\Acr.Settings.9.0.0\lib\xamarinios10\Acr.Settings.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive">
-      <HintPath>..\packages\System.Reactive.4.1.3\lib\netstandard2.0\System.Reactive.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.4.1.5\lib\netstandard2.0\System.Reactive.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\System.Reactive.Core.4.1.3\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.Core.4.1.5\lib\netstandard2.0\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\System.Reactive.Interfaces.4.1.3\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.Interfaces.4.1.5\lib\netstandard2.0\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\System.Reactive.Linq.4.1.3\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.Linq.4.1.5\lib\netstandard2.0\System.Reactive.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\packages\System.Reactive.PlatformServices.4.1.3\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
+      <HintPath>..\packages\System.Reactive.PlatformServices.4.1.5\lib\netstandard2.0\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
     <Reference Include="Xamarin.Forms.Core">
       <HintPath>..\packages\Xamarin.Forms.3.6.0.293080\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
diff --git a/qController.Standard/Classes/Communication/QReceiver.cs b/qController.Standard/Classes/Communication/QReceiver.cs
index 8fe781a..5e7847b 100644
--- a/qController.Standard/Classes/Communication/QReceiver.cs
+++ b/qController.Standard/Classes/Communication/QReceiver.cs
@@ -19,6 +19,7 @@ namespace qController
         public QReceiver(int port)
         {
             Port = port;
+            udpListener = new UDPListener(port);
             thread = new Thread(new ThreadStart(ListenLoop));
             thread.Start();
 
@@ -26,6 +27,7 @@ namespace qController
 
 		public void ListenLoop()
 		{
+            /*
             HandleOscPacket callback = delegate (OscPacket packet)
             {
                 var messageReceived = (OscMessage)packet;
@@ -36,6 +38,17 @@ namespace qController
             };
 
             udpListener = new UDPListener(Port, callback);
+            */
+            while (true)
+            {
+                OscMessage messageReceived = null;
+                while(messageReceived == null)
+                {
+                    messageReceived = (OscMessage)udpListener.Receive();
+                    Thread.Sleep(1);
+                }
+                OnUpdateMessageReceived(messageReceived);
+            }           
 
         }