refactor multiplayer controller and core controller for improved synchronization and management

Author: SomeoneIsWorking

src/platform/libretro/core_controller.c

@@ -9,37 +9,66 @@ void CoreControllerInit(struct CoreController* controller, struct mCore* core) {
     controller->core = core;
     controller->threadContext.core = core;
     controller->threadContext.userData = controller;
-    
-    // Minimal version from Qt:
-    controller->isPaused = false;
     controller->hasStarted = false;
-    
-    // Qt version adds a lot of logging, etc. but we'll use libretro callbacks directly later.
+    controller->multiplayer = NULL;
 }
 
 void CoreControllerDeinit(struct CoreController* controller) {
-    if (controller->core) {
-        controller->core->deinit(controller->core);
+    if (!controller) {
+        return;
     }
+    controller->hasStarted = false;
+    controller->multiplayer = NULL;
+    controller->core = NULL;
 }
 
 void CoreControllerSetPath(struct CoreController* controller, const char* path) {
+    if (!path) {
+        controller->path[0] = '\0';
+        return;
+    }
     strncpy(controller->path, path, sizeof(controller->path) - 1);
+    controller->path[sizeof(controller->path) - 1] = '\0';
 }
 
 void CoreControllerStart(struct CoreController* controller) {
-    if (controller->hasStarted) {
+    if (!controller || !controller->core || controller->hasStarted) {
         return;
     }
     mCoreThreadStart(&controller->threadContext);
     controller->hasStarted = true;
 }
 
 void CoreControllerStop(struct CoreController* controller) {
-    if (!controller->hasStarted) {
+    if (!controller || !controller->hasStarted) {
         return;
     }
     mCoreThreadEnd(&controller->threadContext);
     mCoreThreadJoin(&controller->threadContext);
     controller->hasStarted = false;
 }
+
+bool CoreControllerIsPaused(const struct CoreController* controller) {
+    if (!controller || !controller->hasStarted) {
+        return false;
+    }
+    return mCoreThreadIsPaused((struct mCoreThread*) &controller->threadContext);
+}
+
+bool CoreControllerHasStarted(const struct CoreController* controller) {
+    return controller && controller->hasStarted;
+}
+
+void CoreControllerSetMultiplayer(struct CoreController* controller, struct MultiplayerController* multiplayer) {
+    if (!controller) {
+        return;
+    }
+    controller->multiplayer = multiplayer;
+}
+
+void CoreControllerClearMultiplayer(struct CoreController* controller) {
+    if (!controller) {
+        return;
+    }
+    controller->multiplayer = NULL;
+}

src/platform/libretro/core_controller.h

@@ -10,9 +10,7 @@ struct CoreController {
     struct mCore* core;
     char path[256];
     char savePath[256];
-    bool isPaused;
     bool hasStarted;
-    void* userData;
     struct MultiplayerController* multiplayer;
 };
 
@@ -21,5 +19,9 @@ void CoreControllerDeinit(struct CoreController* controller);
 void CoreControllerSetPath(struct CoreController* controller, const char* path);
 void CoreControllerStart(struct CoreController* controller);
 void CoreControllerStop(struct CoreController* controller);
+bool CoreControllerIsPaused(const struct CoreController* controller);
+bool CoreControllerHasStarted(const struct CoreController* controller);
+void CoreControllerSetMultiplayer(struct CoreController* controller, struct MultiplayerController* multiplayer);
+void CoreControllerClearMultiplayer(struct CoreController* controller);
 
 #endif

src/platform/libretro/libretro.c

@@ -2258,17 +2258,6 @@ bool retro_load_game(const struct retro_game_info* game) {
 	if (numCores > 1) {
 		for (int i = 0; i < numCores; ++i) {
 			CoreControllerStart(&controllers[i]);
-			mCoreThreadPause(&controllers[i].threadContext);
-			struct mCoreSync* sync = &controllers[i].threadContext.impl->sync;
-			MutexLock(&sync->videoFrameMutex);
-			sync->videoFrameWait = false;
-			MutexUnlock(&sync->videoFrameMutex);
-
-			if (i > 0) {
-				MutexLock(&sync->audioBufferMutex);
-				sync->audioWait = false;
-				MutexUnlock(&sync->audioBufferMutex);
-			}
 		}
 	}
 
@@ -2283,11 +2272,12 @@ void retro_unload_game(void) {
 		if (numCores > 1) {
 			MultiplayerControllerDetachGame(&multiplayer, &controllers[i]);
 		}
-		if (controllers[i].hasStarted) {
+		if (CoreControllerHasStarted(&controllers[i])) {
 			CoreControllerStop(&controllers[i]);
 		}
 		mCoreConfigDeinit(&controllers[i].core->config);
 		controllers[i].core->deinit(controllers[i].core);
+		CoreControllerDeinit(&controllers[i]);
 	}
 	MultiplayerControllerDeinit(&multiplayer);
 	numCores = 1;