Merge pull request #12 from labstreaminglayer/restructure

Restructure the wrapper
labstreaminglayer · May 9, 2021 · a1f2a0c · a1f2a0c
2 parents 3fe3201 + 4786512
commit a1f2a0c
Show file tree

Hide file tree

Showing 19 changed files with 1,065 additions and 1,050 deletions.
diff --git a/LSL.cs b/LSL.cs
diff --git a/examples/Directory.Build.props b/examples/Directory.Build.props
@@ -0,0 +1,6 @@
+<Project>
+<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+  <PropertyGroup>
+    <LangVersion>8.0</LangVersion>
+  </PropertyGroup>
+</Project>
diff --git a/examples/HandleMetaData/HandleMetaData.cs b/examples/HandleMetaData/HandleMetaData.cs
@@ -1,45 +1,51 @@
 using System;
-using System.Threading;
 using LSL;
 
-namespace ConsoleApplication1
+namespace LSLExamples
 {
-    class Program
+    static class HandleMetaData
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
+            {
+                using StreamInfo inf_ = new StreamInfo("Test", "EEG", 8, 100, channel_format_t.cf_double64, "test1234");
+                Console.Out.WriteLine("Test");
+            }
             // create a new StreamInfo and declare some meta-data (in accordance with XDF format)
-            liblsl.StreamInfo info = new liblsl.StreamInfo("MetaTester","EEG",8,100,liblsl.channel_format_t.cf_float32,"myuid323457");
-            liblsl.XMLElement chns = info.desc().append_child("channels");
-            String[] labels = {"C3","C4","Cz","FPz","POz","CPz","O1","O2"};
-            for (int k=0;k<labels.Length;k++)
+            using StreamInfo info = new StreamInfo("MetaTester", "EEG", 8, 100, channel_format_t.cf_float32, "myuid323457");
+            XMLElement chns = info.desc().append_child("channels");
+            String[] labels = { "C3", "C4", "Cz", "FPz", "POz", "CPz", "O1", "O2" };
+            for (int k = 0; k < labels.Length; k++)
                 chns.append_child("channel")
                     .append_child_value("label", labels[k])
                     .append_child_value("unit", "microvolts")
-                    .append_child_value("type","EEG");
-            info.desc().append_child_value("manufacturer","SCCN");
+                    .append_child_value("type", "EEG");
+            info.desc().append_child_value("manufacturer", "SCCN");
             info.desc().append_child("cap")
-                .append_child_value("name","EasyCap")
-                .append_child_value("size","54")
-                .append_child_value("labelscheme","10-20");
+                .append_child_value("name", "EasyCap")
+                .append_child_value("size", "54")
+                .append_child_value("labelscheme", "10-20");
 
             // create outlet for the stream
-            liblsl.StreamOutlet outlet = new liblsl.StreamOutlet(info);
-        
+            StreamOutlet outlet = new StreamOutlet(info);
+
             // === the following could run on another computer ===
-        
+
             // resolve the stream and open an inlet
-            liblsl.StreamInfo[] results = liblsl.resolve_stream("name","MetaTester");
-            liblsl.StreamInlet inlet = new liblsl.StreamInlet(results[0]);
+            StreamInfo[] results = LSL.LSL.resolve_stream("name", "MetaTester");
+            using StreamInlet inlet = new StreamInlet(results[0]);
+            results.DisposeArray();
+
             // get the full stream info (including custom meta-data) and dissect it
-            liblsl.StreamInfo inf = inlet.info();
+            using StreamInfo inf = inlet.info();
             Console.WriteLine("The stream's XML meta-data is: ");
             Console.WriteLine(inf.as_xml());
             Console.WriteLine("The manufacturer is: " + inf.desc().child_value("manufacturer"));
             Console.WriteLine("The cap circumference is: " + inf.desc().child("cap").child_value("size"));
             Console.WriteLine("The channel labels are as follows:");
-            liblsl.XMLElement ch = inf.desc().child("channels").child("channel");
-            for (int k=0;k<info.channel_count();k++) {
+            XMLElement ch = inf.desc().child("channels").child("channel");
+            for (int k = 0; k < info.channel_count(); k++)
+            {
                 Console.WriteLine("  " + ch.child_value("label"));
                 ch = ch.next_sibling();
             }

diff --git a/examples/HandleMetaData/HandleMetaData.csproj b/examples/HandleMetaData/HandleMetaData.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
   <PropertyGroup>
-    <Product>HandleMetaData</Product>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+	<TargetFramework>net5.0</TargetFramework>
+	<Version>1.14</Version>
+	<LangVersion>8.0</LangVersion>
+	<OutputType>Exe</OutputType>
   </PropertyGroup>
+   <ItemGroup>
+    <ProjectReference Include="..\..\liblsl.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/examples/LSLExamples.csproj b/examples/LSLExamples.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<!-- All-in-one example project.
+	It contains a launcher for all examples in the subdirectories that
+	compiles to a single .exe, prints some information about the wrapper and
+	passes all arguments through to the example specified as first command line
+	argument. -->
+  <PropertyGroup>
+	<TargetFramework>netcoreapp5.0</TargetFramework>
+	<Product>Labstreaminglayer C# examples</Product>
+	<Version>1.14</Version>
+	<LangVersion>8.0</LangVersion>
+	<OutputType>Exe</OutputType>
+	<StartupObject>LSLExamples.EntryPoint</StartupObject>
+  </PropertyGroup>
+   <ItemGroup>
+    <ProjectReference Include="..\liblsl.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/examples/Main.cs b/examples/Main.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace LSLExamples
+{
+    static class EntryPoint
+    {
+        public static void Main(string[] args) {
+        var examples = Assembly.GetExecutingAssembly().GetTypes()
+              .Where(t => t.Namespace =="LSLExamples").ToDictionary(e=>e.Name, e=>e);
+
+            var WrapperVersion = Assembly.GetAssembly(typeof(LSL.LSL)).GetName().Version.ToString();
+            Console.Out.Write("Wrapper version: ");
+            Console.Out.WriteLine(WrapperVersion);
+            Console.Out.Write("liblsl version: ");
+            Console.Out.WriteLine(LSL.LSL.library_version());
+            if (args.Length < 1 || !examples.ContainsKey(args[0])) {
+				Console.Out.WriteLine("\nNot enough arguments. Valid examples:");
+				foreach(var name in examples.Keys) Console.Out.WriteLine(name);
+				return;
+			}
+            var method = examples[args[0]].GetMethod("Main", BindingFlags.Public|BindingFlags.Static);
+            Console.Out.WriteLine(method);
+            method.Invoke(null, new object[]{ args});
+		}
+	}
+}
+
diff --git a/examples/ReceiveData/ReceiveData.cs b/examples/ReceiveData/ReceiveData.cs
@@ -1,31 +1,28 @@
-using System;
-using System.Threading;
 using LSL;
 
-namespace ConsoleApplication1
+namespace LSLExamples
 {
-    class Program
+    static class ReceiveData
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             // wait until an EEG stream shows up
-            liblsl.StreamInfo[] results = liblsl.resolve_stream("type", "EEG");
+            StreamInfo[] results = LSL.LSL.resolve_stream("type", "EEG");
 
             // open an inlet and print some interesting info about the stream (meta-data, etc.)
-            liblsl.StreamInlet inlet = new liblsl.StreamInlet(results[0]);
+            using StreamInlet inlet = new StreamInlet(results[0]);
+            results.DisposeArray();
             System.Console.Write(inlet.info().as_xml());
 
             // read samples
             float[] sample = new float[8];
-            while (true)
+            while (!System.Console.KeyAvailable)
             {
                 inlet.pull_sample(sample);
                 foreach (float f in sample)
-                    System.Console.Write("\t{0}",f);
+                    System.Console.Write("\t{0}", f);
                 System.Console.WriteLine();
             }
-
-            System.Console.ReadKey();
         }
     }
 }
diff --git a/examples/ReceiveData/ReceiveData.csproj b/examples/ReceiveData/ReceiveData.csproj
@@ -1,10 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Product>ReceiveData</Product>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+	<TargetFramework>net5.0</TargetFramework>
+	<Product>Labstreaminglayer C# examples</Product>
+	<Version>1.14</Version>
+	<LangVersion>8.0</LangVersion>
+	<OutputType>Exe</OutputType>
   </PropertyGroup>
+   <ItemGroup>
+    <ProjectReference Include="..\..\liblsl.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/examples/ReceiveDataInChunks/ReceiveDataInChunks.cs b/examples/ReceiveDataInChunks/ReceiveDataInChunks.cs
@@ -1,30 +1,30 @@
 using System;
-using System.Threading;
 using LSL;
 
-namespace ConsoleApplication1
+namespace LSLExamples
 {
-    class Program
+    static class ReceiveDataInChunks
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             // wait until an EEG stream shows up
-            liblsl.StreamInfo[] results = liblsl.resolve_stream("type", "EEG");
+            StreamInfo[] results = LSL.LSL.resolve_stream("type", "EEG");
 
             // open an inlet, with post-processing enabled, and print meta-data
             // Note: The use of post-processing makes it impossible to recover
             // the original timestamps and is not recommended for applications
             // that store data to disk.
-            liblsl.StreamInlet inlet = new liblsl.StreamInlet(results[0],
-                postproc_flags: liblsl.processing_options_t.proc_ALL);
+            using StreamInlet inlet = new StreamInlet(results[0],
+                postproc_flags: processing_options_t.proc_ALL);
+            results.DisposeArray();
             System.Console.Write(inlet.info().as_xml());
 
             // read samples
             float[,] buffer = new float[512, 8];
             double[] timestamps = new double[512];
-            while (true)
+            while (!Console.KeyAvailable)
             {
-                int num = inlet.pull_chunk(buffer,timestamps);
+                int num = inlet.pull_chunk(buffer, timestamps);
                 for (int s = 0; s < num; s++)
                 {
                     for (int c = 0; c < 8; c++)

diff --git a/examples/ReceiveDataInChunks/ReceiveDataInChunks.csproj b/examples/ReceiveDataInChunks/ReceiveDataInChunks.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
   <PropertyGroup>
-    <Product>ReceiveDataInChunks</Product>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+	<TargetFramework>net5.0</TargetFramework>
+	<Product>Labstreaminglayer C# examples</Product>
+	<Version>1.14</Version>
+	<LangVersion>8.0</LangVersion>
+	<OutputType>Exe</OutputType>
   </PropertyGroup>
+   <ItemGroup>
+    <ProjectReference Include="..\..\liblsl.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/examples/ReceiveStringMarkers/ReceiveStringMarkers.cs b/examples/ReceiveStringMarkers/ReceiveStringMarkers.cs
@@ -1,26 +1,26 @@
 using System;
-using System.Threading;
 using LSL;
 
-namespace ConsoleApplication1
+namespace LSLExamples
 {
-    class Program
+    static class ReceiveStringMarkers
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             // wait until an EEG stream shows up
-            liblsl.StreamInfo[] results = liblsl.resolve_stream("type", "Markers");
+            StreamInfo[] results = LSL.LSL.resolve_stream("type", "Markers");
 
             // open an inlet and print meta-data
-            liblsl.StreamInlet inlet = new liblsl.StreamInlet(results[0]);
-            System.Console.Write(inlet.info().as_xml());
+            using StreamInlet inlet = new StreamInlet(results[0]);
+            results.DisposeArray();
+            Console.Write(inlet.info().as_xml());
 
             // read samples
             string[] sample = new string[1];
-            while (true)
+            while (!Console.KeyAvailable)
             {
                 inlet.pull_sample(sample);
-                System.Console.WriteLine(sample[0]);
+                Console.WriteLine(sample[0]);
             }
         }
     }

diff --git a/examples/ReceiveStringMarkers/ReceiveStringMarkers.csproj b/examples/ReceiveStringMarkers/ReceiveStringMarkers.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
   <PropertyGroup>
-    <Product>ReceiveStringMarkers</Product>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+	<TargetFramework>net5.0</TargetFramework>
+	<Product>Labstreaminglayer C# examples</Product>
+	<Version>1.14</Version>
+	<LangVersion>8.0</LangVersion>
+	<OutputType>Exe</OutputType>
   </PropertyGroup>
+   <ItemGroup>
+    <ProjectReference Include="..\..\liblsl.csproj" />
+  </ItemGroup>
 </Project>
diff --git a/examples/SendData/SendData.cs b/examples/SendData/SendData.cs
@@ -2,28 +2,26 @@
 using System.Threading;
 using LSL;
 
-namespace ConsoleApplication1
+namespace LSLExamples
 {
-    class Program
+    static class SendData
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             Random rnd = new Random();
 
             // create stream info and outlet
-            liblsl.StreamInfo info = new liblsl.StreamInfo("TestCSharp", "EEG", 8, 100, liblsl.channel_format_t.cf_float32, "sddsfsdf");
-            liblsl.StreamOutlet outlet = new liblsl.StreamOutlet(info);
+            using StreamInfo info = new StreamInfo("TestCSharp", "EEG", 8, 100, channel_format_t.cf_float32, "sddsfsdf");
+            using StreamOutlet outlet = new StreamOutlet(info);
             float[] data = new float[8];
-            while (true)
+            while (!Console.KeyAvailable)
             {
                 // generate random data and send it
                 for (int k = 0; k < data.Length; k++)
                     data[k] = rnd.Next(-100, 100);
                 outlet.push_sample(data);
-                System.Threading.Thread.Sleep(10);
+                Thread.Sleep(10);
             }
-
-            System.Console.ReadKey();
         }
     }
 }
diff --git a/examples/SendData/SendData.csproj b/examples/SendData/SendData.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <ProjectReference Include="..\..\liblsl.csproj" />
-  </ItemGroup>
   <PropertyGroup>
-    <Product>SendData</Product>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+	<TargetFramework>net5.0</TargetFramework>
+	<Product>Labstreaminglayer C# examples</Product>
+	<Version>1.14</Version>
+	<LangVersion>8.0</LangVersion>
+	<OutputType>Exe</OutputType>
   </PropertyGroup>
+   <ItemGroup>
+    <ProjectReference Include="..\..\liblsl.csproj" />
+  </ItemGroup>
 </Project>