Prepare API for node addition/removal callback(s)

mumble-voip · Sep 28, 2024 · 08431c4 · 08431c4
1 parent 6b1272c
commit 08431c4
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 14 deletions.
diff --git a/include/crossaudio/Engine.h b/include/crossaudio/Engine.h
@@ -11,14 +11,22 @@
 struct CrossAudio_Engine;
 struct CrossAudio_Node;
 
+struct CrossAudio_EngineFeedback {
+	void *userData;
+
+	void (*nodeAdded)(void *userData, struct CrossAudio_Node *node);
+	void (*nodeRemoved)(void *userData, struct CrossAudio_Node *node);
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 CROSSAUDIO_EXPORT struct CrossAudio_Engine *CrossAudio_engineNew(enum CrossAudio_Backend backend);
 CROSSAUDIO_EXPORT enum CrossAudio_ErrorCode CrossAudio_engineFree(struct CrossAudio_Engine *engine);
 
-CROSSAUDIO_EXPORT enum CrossAudio_ErrorCode CrossAudio_engineStart(struct CrossAudio_Engine *engine);
+CROSSAUDIO_EXPORT enum CrossAudio_ErrorCode CrossAudio_engineStart(struct CrossAudio_Engine *engine,
+																   const struct CrossAudio_EngineFeedback *feedback);
 CROSSAUDIO_EXPORT enum CrossAudio_ErrorCode CrossAudio_engineStop(struct CrossAudio_Engine *engine);
 
 CROSSAUDIO_EXPORT const char *CrossAudio_engineNameGet(struct CrossAudio_Engine *engine);

diff --git a/src/Backend.h b/src/Backend.h
@@ -19,6 +19,7 @@
 typedef enum CrossAudio_Backend Backend;
 typedef enum CrossAudio_ErrorCode ErrorCode;
 
+typedef struct CrossAudio_EngineFeedback EngineFeedback;
 typedef struct CrossAudio_FluxConfig FluxConfig;
 typedef struct CrossAudio_FluxFeedback FluxFeedback;
 typedef struct CrossAudio_Nodes Nodes;
@@ -35,7 +36,7 @@ typedef struct BE_Impl {
 
 	BE_Engine *(*engineNew)(void);
 	ErrorCode (*engineFree)(BE_Engine *engine);
-	ErrorCode (*engineStart)(BE_Engine *engine);
+	ErrorCode (*engineStart)(BE_Engine *engine, const EngineFeedback *feedback);
 	ErrorCode (*engineStop)(BE_Engine *engine);
 	const char *(*engineNameGet)(BE_Engine *engine);
 	ErrorCode (*engineNameSet)(BE_Engine *engine, const char *name);

diff --git a/src/Engine.c b/src/Engine.c
@@ -39,8 +39,8 @@ ErrorCode CrossAudio_engineFree(Engine *engine) {
 	return ec;
 }
 
-ErrorCode CrossAudio_engineStart(Engine *engine) {
-	return engine->beImpl->engineStart(engine->beData);
+ErrorCode CrossAudio_engineStart(Engine *engine, const EngineFeedback *feedback) {
+	return engine->beImpl->engineStart(engine->beData, feedback);
 }
 
 ErrorCode CrossAudio_engineStop(Engine *engine) {

diff --git a/src/Node.c b/src/Node.c
@@ -14,6 +14,12 @@ static void freeNodeInner(Node *node) {
 	free(node->name);
 }
 
+Node *nodeNew(void) {
+	Node *node = calloc(1, sizeof(Node));
+
+	return node;
+}
+
 Nodes *nodesNew(const size_t count) {
 	Nodes *nodes = malloc(sizeof(Nodes));
 

diff --git a/src/Node.h b/src/Node.h
@@ -15,6 +15,7 @@ typedef struct CrossAudio_Nodes Nodes;
 extern "C" {
 #endif
 
+Node *nodeNew(void);
 Nodes *nodesNew(size_t count);
 
 #ifdef __cplusplus

diff --git a/src/backends/ALSA/ALSA.cpp b/src/backends/ALSA/ALSA.cpp
@@ -77,7 +77,7 @@ static ErrorCode engineFree(BE_Engine *engine) {
 	return CROSSAUDIO_EC_OK;
 }
 
-static ErrorCode engineStart(BE_Engine *engine) {
+static ErrorCode engineStart(BE_Engine *engine, const EngineFeedback *) {
 	return toImpl(engine)->start();
 }
 

diff --git a/src/backends/OSS/OSS.cpp b/src/backends/OSS/OSS.cpp
@@ -98,7 +98,7 @@ static ErrorCode engineFree(BE_Engine *engine) {
 	return CROSSAUDIO_EC_OK;
 }
 
-static ErrorCode engineStart(BE_Engine *engine) {
+static ErrorCode engineStart(BE_Engine *engine, const EngineFeedback *) {
 	return toImpl(engine)->start();
 }
 

diff --git a/src/backends/PipeWire/PipeWire.cpp b/src/backends/PipeWire/PipeWire.cpp
@@ -96,7 +96,7 @@ static ErrorCode engineFree(BE_Engine *engine) {
 	return CROSSAUDIO_EC_OK;
 }
 
-static ErrorCode engineStart(BE_Engine *engine) {
+static ErrorCode engineStart(BE_Engine *engine, const EngineFeedback *) {
 	return toImpl(engine)->start();
 }
 

diff --git a/src/backends/PulseAudio/PulseAudio.cpp b/src/backends/PulseAudio/PulseAudio.cpp
@@ -76,7 +76,7 @@ static ErrorCode engineFree(BE_Engine *engine) {
 	return CROSSAUDIO_EC_OK;
 }
 
-static ErrorCode engineStart(BE_Engine *engine) {
+static ErrorCode engineStart(BE_Engine *engine, const EngineFeedback *) {
 	return toImpl(engine)->start();
 }
 

diff --git a/src/backends/Sndio/Sndio.cpp b/src/backends/Sndio/Sndio.cpp
@@ -75,7 +75,7 @@ static ErrorCode engineFree(BE_Engine *engine) {
 	return CROSSAUDIO_EC_OK;
 }
 
-static ErrorCode engineStart(BE_Engine *) {
+static ErrorCode engineStart(BE_Engine *, const EngineFeedback *) {
 	return CROSSAUDIO_EC_OK;
 }
 

diff --git a/src/backends/WASAPI/WASAPI.cpp b/src/backends/WASAPI/WASAPI.cpp
@@ -114,7 +114,7 @@ static ErrorCode engineFree(BE_Engine *engine) {
 	return CROSSAUDIO_EC_OK;
 }
 
-static ErrorCode engineStart(BE_Engine *engine) {
+static ErrorCode engineStart(BE_Engine *engine, const EngineFeedback *) {
 	return toImpl(engine)->start();
 }
 

diff --git a/src/tests/Common.h b/src/tests/Common.h
@@ -24,6 +24,7 @@ typedef enum CrossAudio_Backend Backend;
 typedef enum CrossAudio_ErrorCode ErrorCode;
 
 typedef struct CrossAudio_Engine Engine;
+typedef struct CrossAudio_EngineFeedback EngineFeedback;
 typedef struct CrossAudio_Flux Flux;
 typedef struct CrossAudio_FluxConfig FluxConfig;
 typedef struct CrossAudio_FluxFeedback FluxFeedback;
@@ -50,14 +51,14 @@ static inline bool deinitBackend() {
 	return true;
 }
 
-static inline Engine *createEngine() {
+static inline Engine *createEngine(const EngineFeedback *feedback) {
 	Engine *engine = CrossAudio_engineNew(BACKEND);
 	if (!engine) {
 		printf("CrossAudio_engineNew() failed!\n");
 		return NULL;
 	}
 
-	const ErrorCode ec = CrossAudio_engineStart(engine);
+	const ErrorCode ec = CrossAudio_engineStart(engine, feedback);
 	if (ec != CROSSAUDIO_EC_OK) {
 		printf("CrossAudio_engineStart() failed with error \"%s\"!\n", CrossAudio_ErrorCodeText(ec));
 		CrossAudio_engineFree(engine);

diff --git a/src/tests/TestEnum/Enum.c b/src/tests/TestEnum/Enum.c
@@ -7,15 +7,32 @@
 
 #include "crossaudio/Node.h"
 
+#include <stddef.h>
+#include <stdio.h>
+
 typedef struct CrossAudio_Node Node;
 typedef struct CrossAudio_Nodes Nodes;
 
+static void nodeAdded(void *userData, Node *node) {
+	(void)userData;
+	printf("Node added: [%s] %s (%s)\n", node->id, node->name, CrossAudio_DirectionText(node->direction));
+	CrossAudio_nodeFree(node);
+}
+
+static void nodeRemoved(void *userData, Node *node) {
+	(void)userData;
+	printf("Node removed: [%s] %s (%s)\n", node->id, node->name, CrossAudio_DirectionText(node->direction));
+	CrossAudio_nodeFree(node);
+}
+
 int main() {
 	if (!initBackend()) {
 		return 1;
 	}
 
-	Engine *engine = createEngine();
+	const EngineFeedback feedback = { .userData = NULL, .nodeAdded = nodeAdded, .nodeRemoved = nodeRemoved };
+
+	Engine *engine = createEngine(&feedback);
 	if (!engine) {
 		return 2;
 	}

diff --git a/src/tests/TestLoopback/Loopback.c b/src/tests/TestLoopback/Loopback.c
@@ -8,6 +8,7 @@
 #include "RingBuffer.h"
 
 #include <stdbool.h>
+#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 
@@ -64,7 +65,7 @@ int main(const int argc, const char *argv[]) {
 		return 1;
 	}
 
-	Engine *engine = createEngine();
+	Engine *engine = createEngine(NULL);
 	if (!engine) {
 		return 2;
 	}