From 11fb3911a6ddb8073dd658a31f53f749098bb6aa Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Sat, 8 Aug 2020 20:58:11 +0100
Subject: [PATCH] Update SDL 1.2 backend to reflect recent changes

---
 src/Backends/Audio/SDL1.cpp                   |  1 -
 src/Backends/Platform/SDL1.cpp                | 19 ++++++++++++-------
 .../Rendering/Window/Software/SDL1.cpp        |  1 -
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/Backends/Audio/SDL1.cpp b/src/Backends/Audio/SDL1.cpp
index b750a4c2..791c801f 100644
--- a/src/Backends/Audio/SDL1.cpp
+++ b/src/Backends/Audio/SDL1.cpp
@@ -1,7 +1,6 @@
 #include "../Audio.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 
diff --git a/src/Backends/Platform/SDL1.cpp b/src/Backends/Platform/SDL1.cpp
index 110f6b1a..75e0fc46 100644
--- a/src/Backends/Platform/SDL1.cpp
+++ b/src/Backends/Platform/SDL1.cpp
@@ -1,6 +1,8 @@
 #include "../Misc.h"
 
+#include <stdarg.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
@@ -8,10 +10,10 @@
 #include "SDL.h"
 
 #include "../Rendering.h"
+#include "../../Attributes.h"
 #include "../../Main.h"
 #include "../../Organya.h"
 #include "../../Profile.h"
-#include "../../Resource.h"
 
 #define DO_KEY(SDL_KEY, BACKEND_KEY) \
 	case SDL_KEY: \
@@ -55,8 +57,10 @@ void Backend_PostWindowCreation(void)
 {
 }
 
-bool Backend_GetBasePath(char *string_buffer)
+bool Backend_GetBasePath(std::string *string_buffer)
 {
+	(void)string_buffer;
+
 	return false;
 }
 
@@ -94,13 +98,14 @@ void PlaybackBackend_EnableDragAndDrop(void)
 
 bool Backend_SystemTask(bool active)
 {
-	if (SDL_PollEvent(NULL) || !active)
-	{
-		SDL_Event event;
-
-		if (!SDL_WaitEvent(&event))
+	if (!active)
+		if (!SDL_WaitEvent(NULL))
 			return false;
 
+	SDL_Event event;
+
+	while (SDL_PollEvent(&event))
+	{
 		switch (event.type)
 		{
 			case SDL_KEYUP:
diff --git a/src/Backends/Rendering/Window/Software/SDL1.cpp b/src/Backends/Rendering/Window/Software/SDL1.cpp
index e10603e4..cce2f798 100644
--- a/src/Backends/Rendering/Window/Software/SDL1.cpp
+++ b/src/Backends/Rendering/Window/Software/SDL1.cpp
@@ -1,7 +1,6 @@
 #include "../Software.h"
 
 #include <stddef.h>
-#include <stdlib.h>
 #include <string>
 
 #include "SDL.h"