fixes issue with manually created netDevices not being started

Author: joreg

src/Acquisition.cs

@@ -17,13 +17,11 @@ namespace VL.Devices.Orbbec
 {
     internal class Acquisition : IVideoPlayer
     {
-        public static Acquisition? Start(VideoIn videoIn, Advanced.DeviceInfo deviceInfo, ILogger logger, Int2 resolution, int fps)//, IConfiguration? configuration)
+        public static Acquisition? Start(VideoIn videoIn, Device device, ILogger logger, Int2 resolution, int fps)//, IConfiguration? configuration)
         {
+            var deviceInfo = device.GetDeviceInfo();
             logger.Log(LogLevel.Information, "Starting image acquisition on {device}", deviceInfo.SerialNumber);
 
-            var contextHandle = ContextManager.GetHandle();
-
-            Device device = contextHandle.Resource.QueryDeviceList().GetDeviceBySN(deviceInfo.SerialNumber);
             Pipeline pipe = new Pipeline(device);
 
             /*SensorList s = device.GetSensorList();
@@ -69,6 +67,7 @@ internal class Acquisition : IVideoPlayer
                 return null;
             }
 
+            var contextHandle = ContextManager.GetHandle();
             return new Acquisition(contextHandle, logger, pipe, resolution, videoIn);
         }
 

src/Advanced/OrbbecDevice.cs

@@ -137,8 +137,16 @@ protected override IReadOnlyDictionary<string, object> GetEntries()
     }
 
     //Optionally trigger addedList change of your enum. This will in turn call GetEntries() again
-    protected override IObservable<object> GetEntriesChangedObservable() => _devicesChanged;
-
-    //Optionally disable alphabetic sorting
+    protected override IObservable<object> GetEntriesChangedObservable() => _devicesChanged;
+
+    internal Device? GetDeviceBySN(string serialNumber)
+    {
+        foreach (var netDevice in _netDevices)
+            if (netDevice.Value.GetDeviceInfo().SerialNumber() == serialNumber)
+                return netDevice.Value;
+        return null;
+    }
+
+    //Optionally disable alphabetic sorting
     protected override bool AutoSortAlphabetically => false; //true is the default
 }

src/VideoIn.cs

@@ -17,7 +17,7 @@ public class VideoIn : IVideoSource2, IDisposable
         private readonly BehaviorSubject<Acquisition?> _aquicitionStarted = new BehaviorSubject<Acquisition?>(null);
 
         private int _changedTicket;
-        private Advanced.DeviceInfo? _device;
+        private Advanced.DeviceInfo? _deviceInfo;
         private Int2 _resolution;
         private int _fps;
         //private IConfiguration? _configuration;
@@ -43,9 +43,9 @@ public VideoIn([Pin(Visibility = PinVisibility.Hidden)] NodeContext nodeContext)
             out string Info)
         {
             // By comparing the device info we can be sure that on re-connect of the device we see the change
-            if (!Equals(device?.Tag, _device) || enabled != _enabled || resolution != _resolution || FPS != _fps)// || configuration != _configuration)
+            if (!Equals(device?.Tag, _deviceInfo) || enabled != _enabled || resolution != _resolution || FPS != _fps)// || configuration != _configuration)
             {
-                _device = device?.Tag as Advanced.DeviceInfo;
+                _deviceInfo = device?.Tag as Advanced.DeviceInfo;
                 _resolution = resolution;
                 _fps = FPS;
                 //_configuration = configuration;
@@ -64,12 +64,17 @@ public VideoIn([Pin(Visibility = PinVisibility.Hidden)] NodeContext nodeContext)
 
         IVideoPlayer? IVideoSource2.Start(VideoPlaybackContext ctx)
         {
-            var device = _device;
-            if (device is null)
+            var deviceInfo = _deviceInfo;
+            if (deviceInfo is null)
                 return null;
 
             try
             {
+                //get the device either from the list of auto-enumerated devices
+                Device? device = ContextManager.GetHandle().Resource.QueryDeviceList().GetDeviceBySN(deviceInfo.SerialNumber);
+                //or from the manually created list of NetDevices
+                if (device == null)
+                   device = OrbbecDeviceDefinition.Instance.GetDeviceBySN(deviceInfo.SerialNumber);
                 var result = Acquisition.Start(this, device, _logger, _resolution, _fps);//, _configuration
                 //_aquicitionStarted.OnNext(result);
                 return result;