From cdd97cb733b08206fc53a1f374108609b87f7a20 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Mon, 13 Apr 2020 13:32:31 +0100 Subject: [PATCH] Some cleanup --- src/Backends/Audio/miniaudio.cpp | 9 ++++++--- src/Backends/GLFW3/Controller.cpp | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Backends/Audio/miniaudio.cpp b/src/Backends/Audio/miniaudio.cpp index 34cc6799..07813f48 100644 --- a/src/Backends/Audio/miniaudio.cpp +++ b/src/Backends/Audio/miniaudio.cpp @@ -7,9 +7,9 @@ #define MA_API static #include "../../../external/miniaudio.h" +#include "../Misc.h" #include "../../Organya.h" #include "../../WindowsWrapper.h" -#include "../Misc.h" #include "SoftwareMixer.h" @@ -84,15 +84,19 @@ BOOL AudioBackend_Init(void) ma_result return_value; return_value = ma_device_init(NULL, &config, &device); + if (return_value == MA_SUCCESS) { return_value = ma_mutex_init(device.pContext, &mutex); + if (return_value == MA_SUCCESS) { return_value = ma_mutex_init(device.pContext, &organya_mutex); + if (return_value == MA_SUCCESS) { return_value = ma_device_start(&device); + if (return_value == MA_SUCCESS) { output_frequency = device.sampleRate; @@ -133,8 +137,7 @@ BOOL AudioBackend_Init(void) void AudioBackend_Deinit(void) { - ma_result return_value; - return_value = ma_device_stop(&device); + ma_result return_value = ma_device_stop(&device); if (return_value != MA_SUCCESS) Backend_PrintError("Failed to stop playback device: %s", ma_result_description(return_value)); diff --git a/src/Backends/GLFW3/Controller.cpp b/src/Backends/GLFW3/Controller.cpp index b3f77e34..b82cd482 100644 --- a/src/Backends/GLFW3/Controller.cpp +++ b/src/Backends/GLFW3/Controller.cpp @@ -7,8 +7,8 @@ #define GLFW_INCLUDE_NONE #include -#include "../../WindowsWrapper.h" #include "../Misc.h" +#include "../../WindowsWrapper.h" #define DEADZONE (10000.0f / 32767.0f)