ZeroConf: rename Hosts

magicrub · Jun 19, 2021 · 782b586 · 782b586
1 parent 6f790f4
commit 782b586
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/Controls/Video.cs b/Controls/Video.cs
@@ -18,7 +18,7 @@ private void Video_Load(object sender, EventArgs e)
             chk.Text = "Display External";
             flowLayoutPanel1.Controls.Add(chk);
 
-            foreach (var zeroconfHost in ZeroConf.Hosts)
+            foreach (var zeroconfHost in ZeroConf.RtspHosts)
             {
                 Label lbl = new Label();
                 lbl.Text = zeroconfHost.Id;

diff --git a/ExtLibs/Utilities/ZeroConf.cs b/ExtLibs/Utilities/ZeroConf.cs
@@ -10,43 +10,41 @@ namespace MissionPlanner.Utilities
 {
     public class ZeroConf
     {
-        public static List<IZeroconfHost> Hosts = new List<IZeroconfHost>();
+        public static List<IZeroconfHost> RtspHosts = new List<IZeroconfHost>();
 
         public delegate void ZeroConfHost(IZeroconfHost zeroconfHost);
 
         public static event ZeroConfHost StartUDPMavlink;
 
         public static void ProbeForRTSP()
         {
-            Thread th = new Thread(resolverAsync);
-            th.IsBackground = true;
-            th.Start();
+            resolverAsync();
         }
 
-        private static void resolverAsync()
+        private static async void resolverAsync()
         {
             while (true)
             {
                 try
                 {
-                    var results = ZeroconfResolver.ResolveAsync("_rtsp._udp.local.");
+                    var results = await ZeroconfResolver.ResolveAsync("_rtsp._udp.local.");
 
                     if (results != null)
                     {
-                        foreach (var zeroconfHost in results.Result)
+                        foreach (var zeroconfHost in results)
                         {
                             Console.WriteLine("Stream " + zeroconfHost);
-                            if (!Hosts.Contains(zeroconfHost))
-                                Hosts.Add(zeroconfHost);
+                            if (!RtspHosts.Contains(zeroconfHost))
+                                RtspHosts.Add(zeroconfHost);
                         }
                     }
                 }
                 catch
                 {
 
                 }
-
-                Thread.Sleep(30000);
+                
+                await Task.Delay(30000);
             }
         }
 
@@ -60,22 +58,20 @@ public static async Task EnumerateAllServicesFromAllHosts()
 
         public static void ProbeForMavlink()
         {
-            Thread th = new Thread(resolverMavlinkAsync);
-            th.IsBackground = true;
-            th.Start();
+            resolverMavlinkAsync();
         }
 
-        private static void resolverMavlinkAsync(object obj)
+        private static async void resolverMavlinkAsync()
         {
             while (true)
             {
                 try
                 {
-                    var results = ZeroconfResolver.ResolveAsync("_mavlink._udp.local.");
+                    var results = await ZeroconfResolver.ResolveAsync("_mavlink._udp.local.");
 
                     if (results != null)
                     {
-                        foreach (var zeroconfHost in results.Result)
+                        foreach (var zeroconfHost in results)
                         {
                             Console.WriteLine("Mavlink " + zeroconfHost);
                             var service = zeroconfHost.Services.Where(a => a.Key == "_mavlink._udp.local.");
@@ -91,7 +87,7 @@ private static void resolverMavlinkAsync(object obj)
 
                 }
 
-                Thread.Sleep(30000);
+                await Task.Delay(30000);
             }
         }
     }