From 7b06587b33bb6d529ce3cd77258ab078457f8136 Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Fri, 6 Sep 2024 00:23:05 +0200
Subject: [PATCH] Add optional Callback delegates to endpoints

---
 GlaxOSC/OSC.cs         | 24 ++++++++++++++++++------
 GlaxOSC/OSCEndpoint.cs | 15 +++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 GlaxOSC/OSCEndpoint.cs

diff --git a/GlaxOSC/OSC.cs b/GlaxOSC/OSC.cs
index 18f2de2..05545f5 100644
--- a/GlaxOSC/OSC.cs
+++ b/GlaxOSC/OSC.cs
@@ -20,7 +20,7 @@ public class OSC : IDisposable
     private const int UpdateInterval = 10;
     internal readonly Dictionary<string, object?> ParameterValues = new();
     
-    public OSC(string serviceName, Dictionary<string, Type> endpoints, string ipSend = "127.0.0.1", int portSend = 9000, int? portReceive = null, ILogger? logger = null)
+    public OSC(string serviceName, IEnumerable<OSCEndpoint> endpoints, string ipSend = "127.0.0.1", int portSend = 9000, int? portReceive = null, ILogger? logger = null) 
     {
         this._logger = logger;
         this.Client = new OscClient(ipSend, portSend);
@@ -36,8 +36,8 @@ public class OSC : IDisposable
         
         this._oscServer = new OscServer(OSCPort);
         this.AddEndpoint("/avatar/change", typeof(string));
-        foreach (KeyValuePair<string, Type> endpoint in endpoints)
-            this.AddEndpoint(endpoint.Key, endpoint.Value);
+        foreach (OSCEndpoint endpoint in endpoints)
+            this.AddEndpoint(endpoint);
         this._oscServer.Start();
         
         this._logger?.LogInformation($"TCP: {this._oscQuery.TcpPort} UDP/OSC: {portReceive}");
@@ -46,6 +46,14 @@ public class OSC : IDisposable
         this._listenThread.Start();
     }
 
+    public OSC(string serviceName, Dictionary<string, Type> endpoints, string ipSend = "127.0.0.1", int portSend = 9000,
+        int? portReceive = null, ILogger? logger = null)
+        : this(serviceName, endpoints.Select(endpoint => new OSCEndpoint(endpoint.Key, endpoint.Value, null)), ipSend,
+            portSend, portReceive, logger)
+    {
+        
+    }
+
     private void Listen()
     {
         while (_keepRunning)
@@ -81,7 +89,10 @@ public class OSC : IDisposable
 
     public delegate void OnParameterChangeEventHandler(string endpoint, object? oldValue, object? newValue);
 
-    internal void AddEndpoint(string endpoint, Type type)
+    internal void AddEndpoint(OSCEndpoint oscEndpoint) =>
+        AddEndpoint(oscEndpoint.Endpoint, oscEndpoint.Type, oscEndpoint.Callback);
+
+    internal void AddEndpoint(string endpoint, Type type, OnParameterChangeEventHandler? callback = null)
     {
         this._logger?.LogDebug($"Adding endpoint {endpoint}");
         Dictionary<Type, string> oscTypeLookup = new Dictionary<Type, string>()
@@ -99,10 +110,10 @@ public class OSC : IDisposable
         };
         this._oscQuery.AddEndpoint(endpoint, oscTypeLookup[type], Attributes.AccessValues.WriteOnly);
         this.ParameterValues.Add(endpoint, null);
-        this._oscServer.TryAddMethod(endpoint, values => HandleParameterChange(endpoint, type, values));
+        this._oscServer.TryAddMethod(endpoint, values => HandleParameterChange(endpoint, type, values, callback));
     }
 
-    private void HandleParameterChange(string endpoint, Type type, OscMessageValues values)
+    private void HandleParameterChange(string endpoint, Type type, OscMessageValues values, OnParameterChangeEventHandler? callback)
     {
         object? oldValue = ParameterValues[endpoint];
         if (type == typeof(int))
@@ -120,6 +131,7 @@ public class OSC : IDisposable
         else if (type == typeof(bool))
             ParameterValues[endpoint] = values.ReadBooleanElement(0);
         OnParameterChangeEvent?.Invoke(endpoint, oldValue, ParameterValues[endpoint]);
+        callback?.Invoke(endpoint, oldValue, ParameterValues[endpoint]);
         this._logger?.LogDebug($"{endpoint} {oldValue} -> {ParameterValues[endpoint]}");
     }
 
diff --git a/GlaxOSC/OSCEndpoint.cs b/GlaxOSC/OSCEndpoint.cs
new file mode 100644
index 0000000..d8d82bd
--- /dev/null
+++ b/GlaxOSC/OSCEndpoint.cs
@@ -0,0 +1,15 @@
+namespace GlaxOSC;
+
+public struct OSCEndpoint
+{
+    public string Endpoint;
+    public Type Type;
+    public OSC.OnParameterChangeEventHandler? Callback;
+
+    public OSCEndpoint(string endpoint, Type type, OSC.OnParameterChangeEventHandler? callback)
+    {
+        this.Endpoint = endpoint;
+        this.Type = type;
+        this.Callback = callback;
+    }
+}
\ No newline at end of file