Merge pull request #73 from neurogears/issue-72

Ensure block size is set just before context start
open-ephys · Apr 9, 2024 · 7ed4ada · 7ed4ada
2 parents 830f5bd + d08b161
commit 7ed4ada
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/OpenEphys.Onix/OpenEphys.Onix/ContextTask.cs b/OpenEphys.Onix/OpenEphys.Onix/ContextTask.cs
@@ -145,14 +145,16 @@ void ConfigureResources(StackDisposable disposable, Func<ContextTask, IDisposabl
             }
         }
 
-        internal void Start()
+        internal void Start(int blockReadSize, int blockWriteSize)
         {
             lock (regLock)
             {
                 if (running) return;
 
                 // NB: Configure context before starting acquisition
                 ContextConfiguration = ConfigureContext();
+                ctx.BlockReadSize = blockReadSize;
+                ctx.BlockWriteSize = blockWriteSize;
 
                 // NB: Stuff related to sync mode is 100% ONIX, not ONI, so long term another place
                 // to do this separation might be needed
@@ -289,10 +291,6 @@ public int BlockReadSize
             {
                 return ctx.BlockReadSize;
             }
-            set
-            {
-                ctx.BlockReadSize = value;
-            }
         }
 
         public int BlockWriteSize
@@ -301,10 +299,6 @@ public int BlockWriteSize
             {
                 return ctx.BlockWriteSize;
             }
-            set
-            {
-                ctx.BlockWriteSize = value;
-            }
         }
 
         public PassthroughState HubState

diff --git a/OpenEphys.Onix/OpenEphys.Onix/StartAcquisition.cs b/OpenEphys.Onix/OpenEphys.Onix/StartAcquisition.cs
@@ -21,9 +21,7 @@ public class StartAcquisition : Combinator<ContextTask, oni.Frame>
                     var disposable = context.FrameReceived.SubscribeSafe(observer);
                     try
                     {
-                        context.BlockReadSize = ReadSize;
-                        context.BlockWriteSize = WriteSize;
-                        context.Start();
+                        context.Start(ReadSize, WriteSize);
                     }
                     catch
                     {