Renamed api; fixed various warnings

1 files changed, 46 insertions, 52 deletions

diff --git a/src/survive_api.c b/src/survive_api.c
index e2c3d54..a39524b 100644
--- a/src/survive_api.c
+++ b/src/survive_api.c
@@ -3,13 +3,10 @@
 #include "survive.h"
 #include "stdio.h"
 
-struct SurviveAsyncObject {
-	struct SurviveAsyncContext* actx;
-	
-	enum SurviveAsyncObject_type {
-		SurviveAsyncObject_LIGHTHOUSE,
-		SurviveAsyncObject_OBJECT
-	} type;
+struct SurviveSimpleObject {
+	struct SurviveSimpleContext *actx;
+
+	enum SurviveSimpleObject_type { SurviveSimpleObject_LIGHTHOUSE, SurviveSimpleObject_OBJECT } type;
 
 	union {
 		int lighthouse;
@@ -20,7 +17,7 @@ struct SurviveAsyncObject {
 	bool has_update;
 };
 
-struct SurviveAsyncContext {
+struct SurviveSimpleContext {
 	SurviveContext* ctx; 
 	
 	bool running;
@@ -28,21 +25,21 @@ struct SurviveAsyncContext {
 	og_mutex_t poll_mutex;
 
 	size_t object_ct;
-	struct SurviveAsyncObject objects[]; 
+	struct SurviveSimpleObject objects[];
 };
 
 static void pose_fn(SurviveObject *so, uint32_t timecode, SurvivePose *pose) {
-	struct SurviveAsyncContext *actx = so->ctx->user_ptr;
+	struct SurviveSimpleContext *actx = so->ctx->user_ptr;
 	OGLockMutex(actx->poll_mutex);
-	survive_default_raw_pose_process(so, timecode, pose);	
+	survive_default_raw_pose_process(so, timecode, pose);
 
-	int idx = (int)so->user_ptr;
+	intptr_t idx = (intptr_t)so->user_ptr;
 	actx->objects[idx].has_update = true;
 	OGUnlockMutex(actx->poll_mutex);
 }
 static void lh_fn(SurviveContext *ctx, uint8_t lighthouse, SurvivePose *lighthouse_pose,
 	SurvivePose *object_pose) {
-	struct SurviveAsyncContext *actx = ctx->user_ptr;
+	struct SurviveSimpleContext *actx = ctx->user_ptr;
 	OGLockMutex(actx->poll_mutex);
 	survive_default_lighthouse_pose_process(ctx, lighthouse, lighthouse_pose, object_pose);
 
@@ -51,7 +48,7 @@ static void lh_fn(SurviveContext *ctx, uint8_t lighthouse, SurvivePose *lighthou
 	OGUnlockMutex(actx->poll_mutex);
 }
 
-struct SurviveAsyncContext *survive_async_init(int argc, char *const *argv) {
+struct SurviveSimpleContext *survive_simple_init(int argc, char *const *argv) {
 	SurviveContext* ctx = survive_init(argc, argv);
 	if (ctx == 0)
 		return 0;
@@ -59,25 +56,26 @@ struct SurviveAsyncContext *survive_async_init(int argc, char *const *argv) {
 	survive_startup(ctx);
 
 	int object_ct = ctx->activeLighthouses + ctx->objs_ct;
-	struct SurviveAsyncContext * actx = calloc(1, sizeof(struct SurviveAsyncContext) + sizeof(struct SurviveAsyncObject) * object_ct );
+	struct SurviveSimpleContext *actx =
+		calloc(1, sizeof(struct SurviveSimpleContext) + sizeof(struct SurviveSimpleObject) * object_ct);
 	actx->object_ct = object_ct;
 	actx->ctx = ctx;
 	actx->poll_mutex = OGCreateMutex();
 	ctx->user_ptr = actx;
-	int i = 0;
+	intptr_t i = 0;
 	for (i = 0; i < ctx->activeLighthouses; i++) {
-		struct SurviveAsyncObject* obj = &actx->objects[i];
+		struct SurviveSimpleObject *obj = &actx->objects[i];
 		obj->data.lighthouse = i;
-		obj->type = SurviveAsyncObject_LIGHTHOUSE;
+		obj->type = SurviveSimpleObject_LIGHTHOUSE;
 		obj->actx = actx;
 		obj->has_update = ctx->bsd[i].PositionSet;
-		snprintf(obj->name, 32, "LH%d", i);
+		snprintf(obj->name, 32, "LH%ld", i);
 	}
 	for (; i < object_ct; i++) {
-		struct SurviveAsyncObject* obj = &actx->objects[i];
+		struct SurviveSimpleObject *obj = &actx->objects[i];
 		int so_idx = i - ctx->activeLighthouses;
 		obj->data.so = ctx->objs[so_idx];
-		obj->type = SurviveAsyncObject_OBJECT;
+		obj->type = SurviveSimpleObject_OBJECT;
 		obj->actx = actx;
 		obj->data.so->user_ptr = (void*)i;
 		snprintf(obj->name, 32, "%s", obj->data.so->codename);
@@ -88,53 +86,52 @@ struct SurviveAsyncContext *survive_async_init(int argc, char *const *argv) {
 	return actx;
 }
 
-void survive_async_close(struct SurviveAsyncContext* actx) {
+int survive_simple_stop_thread(struct SurviveSimpleContext *actx) {
+	actx->running = false;
+	intptr_t error = (intptr_t)OGJoinThread(actx->thread);
+	if (error != 0) {
+		SurviveContext *ctx = actx->ctx;
+		SV_INFO("Warning: Loope exited with error %ld", error);
+	}
+	return error;
+}
+
+void survive_simple_close(struct SurviveSimpleContext *actx) {
 	if (actx->running) {
-		survive_async_stop_thread(actx);
+		survive_simple_stop_thread(actx);
 	}
 
 	survive_close(actx->ctx);
 }
 
-static inline void* __async_thread(void* _actx) {
-	struct SurviveAsyncContext* actx = _actx; 
-	int error = 0;
+static inline void *__simple_thread(void *_actx) {
+	struct SurviveSimpleContext *actx = _actx;
+	intptr_t error = 0;
 	while (actx->running && error == 0) {
 		error = survive_poll(actx->ctx);
 	}
 	actx->running = false;
 	return (void*)error; 
 }
-bool survive_async_is_running(struct SurviveAsyncContext* actx) {
-	return actx->running;
-}
-void survive_async_start_thread(struct SurviveAsyncContext* actx) {
+bool survive_simple_is_running(struct SurviveSimpleContext *actx) { return actx->running; }
+void survive_simple_start_thread(struct SurviveSimpleContext *actx) {
 	actx->running = true;
-	actx->thread = OGCreateThread(__async_thread, actx);
-}
-int survive_async_stop_thread(struct SurviveAsyncContext* actx) {
-	actx->running = false; 
-	int error = (int)OGJoinThread(actx->thread);
-	if (error != 0) {
-		SurviveContext* ctx = actx->ctx;
-		SV_INFO("Warning: Loope exited with error %d", error);
-	}
-	return error;
+	actx->thread = OGCreateThread(__simple_thread, actx);
 }
 
-const struct SurviveAsyncObject *survive_async_get_next_object(struct SurviveAsyncContext *actx,
-															   const struct SurviveAsyncObject *curr) {
-	const struct SurviveAsyncObject* next = curr + 1; 
+const struct SurviveSimpleObject *survive_simple_get_next_object(struct SurviveSimpleContext *actx,
+																 const struct SurviveSimpleObject *curr) {
+	const struct SurviveSimpleObject *next = curr + 1;
 	if (next >= actx->objects + actx->object_ct)
 		return 0;
 	return next;
 }
 
-const struct SurviveAsyncObject *survive_async_get_first_object(struct SurviveAsyncContext *actx) {
+const struct SurviveSimpleObject *survive_simple_get_first_object(struct SurviveSimpleContext *actx) {
 	return actx->objects;
 }
 
-const struct SurviveAsyncObject* survive_async_get_next_updated(struct SurviveAsyncContext* actx) {
+const struct SurviveSimpleObject *survive_simple_get_next_updated(struct SurviveSimpleContext *actx) {
 	for (int i = 0; i < actx->object_ct; i++) {
 		if (actx->objects[i].has_update) {
 			actx->objects[i].has_update = false;
@@ -144,17 +141,17 @@ const struct SurviveAsyncObject* survive_async_get_next_updated(struct SurviveAs
 	return 0;
 }
 
-uint32_t survive_async_object_get_latest_pose(const struct SurviveAsyncObject* sao, SurvivePose* pose) {
+uint32_t survive_simple_object_get_latest_pose(const struct SurviveSimpleObject *sao, SurvivePose *pose) {
 	uint32_t timecode = 0;
 	OGLockMutex(sao->actx->poll_mutex);
 
 	switch (sao->type) {
-	case SurviveAsyncObject_LIGHTHOUSE: {
+	case SurviveSimpleObject_LIGHTHOUSE: {
 		if(pose)
 			*pose = sao->actx->ctx->bsd[sao->data.lighthouse].Pose;
 		break;
 	}
-	case SurviveAsyncObject_OBJECT:
+	case SurviveSimpleObject_OBJECT:
 		if(pose) 
 			*pose = sao->data.so->OutPose;
 		timecode = sao->data.so->OutPose_timecode;
@@ -165,7 +162,4 @@ uint32_t survive_async_object_get_latest_pose(const struct SurviveAsyncObject* s
 	return timecode;
 }
 
-const char * survive_async_object_name(const SurviveAsyncObject * sao)
-{
-	return sao->name;
-}
+const char *survive_simple_object_name(const SurviveSimpleObject *sao) { return sao->name; }