shithub: cstory

Info  •  Files  •  Log  •  Branches

Remove Organya dependency from platform backend

--- a/src/Backends/Platform/GLFW3.cpp

+++ b/src/Backends/Platform/GLFW3.cpp

@@ -15,7 +15,6 @@

 #include "../Shared/GLFW3.h"

 #include "../../Attributes.h"

 #include "../../Main.h"

-#include "../../Organya.h"

 #include "../../Profile.h"

 #define DO_KEY(GLFW_KEY, BACKEND_KEY) \

@@ -271,10 +270,7 @@

 bool Backend_SystemTask(bool active)

 {

 	if (glfwWindowShouldClose(window))

-	{

-		StopOrganyaMusic();

 		return false;

-	}

 	if (active)

 		glfwPollEvents();

--- a/src/Backends/Platform/SDL2.cpp

+++ b/src/Backends/Platform/SDL2.cpp

@@ -13,7 +13,6 @@

 #include "../Shared/SDL2.h"

 #include "../../Attributes.h"

 #include "../../Main.h"

-#include "../../Organya.h"

 #include "../../Profile.h"

 #define DO_KEY(SDL_KEY, BACKEND_KEY) \

@@ -294,7 +293,6 @@

 				break;

 			case SDL_QUIT:

-				StopOrganyaMusic();

 				return false;

 			case SDL_RENDER_TARGETS_RESET:

--- a/src/Main.cpp

+++ b/src/Main.cpp

@@ -388,7 +388,10 @@

 	do

 	{

 		if (!Backend_SystemTask(bActive))

+		{

+			StopOrganyaMusic();

 			return FALSE;

+		}

 	} while(!bActive);

 	bool keyboard_state[BACKEND_KEYBOARD_TOTAL];