git.y1.nz

commit 8e125b31f65a59310cb7a92348f88a38071b5ca1
parent 2a29570f17757ab7fb93feb2bbf4c7e8c644634d
Author: Lior Halphon <LIJI32@gmail.com>
Date:   Sat, 23 Jul 2022 14:21:31 +0300

macOS compatibility, stability

Diffstat:
M
Makefile
5
+++++
M
SDL/audio/openal.c
48
++++++++++++++++++++++++++++++------------------

2 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/Makefile b/Makefile
@@ -28,6 +28,7 @@ PB12_COMPRESS := build/pb12$(EXESUFFIX)
 
 ifeq ($(PLATFORM),Darwin)
 DEFAULT := cocoa
+ENABLE_OPENAL ?= 1
 else
 DEFAULT := sdl
 endif
@@ -138,7 +139,11 @@ SDL_LDFLAGS := $(shell sdl2-config --libs) -lpthread
 # so we must do this manually
 ifeq ($(ENABLE_OPENAL),1)
 SDL_CFLAGS += -DENABLE_OPENAL
+ifeq ($(PLATFORM),Darwin)
+SDL_LDFLAGS += -framework OpenAL
+else
 SDL_LDFLAGS += -lopenal
+endif
 SDL_AUDIO_DRIVERS += openal
 endif
 else
diff --git a/SDL/audio/openal.c b/SDL/audio/openal.c
@@ -1,6 +1,12 @@
 #include "audio.h"
+#if defined(__APPLE__)
+#include <OpenAL/al.h>
+#include <OpenAL/alc.h>
+
+#else
 #include <AL/al.h>
 #include <AL/alc.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,6 +20,7 @@ static ALuint al_source = 0;
 static ALCint sample_rate = 0;
 static unsigned buffer_size = 0;
 static unsigned buffer_pos = 0;
+static bool is_paused = false;
 
 #define AL_ERR_STRINGIFY(x) #x
 #define AL_ERR_TOSTRING(x) AL_ERR_STRINGIFY(x)
@@ -21,9 +28,10 @@ static unsigned buffer_pos = 0;
 
 // Check if the previous OpenAL call returned an error.
 // If an error occurred a message will be logged to stderr.
-static bool check_al_error(const char *user_msg, const char *line) {
+static bool check_al_error(const char *user_msg, const char *line)
+{
     ALCenum error = alGetError();
-    char *description;
+    const char *description = "";
 
     switch (error) {
         case AL_NO_ERROR:
@@ -55,7 +63,8 @@ static bool check_al_error(const char *user_msg, const char *line) {
     return true;
 }
 
-static void _audio_deinit(void) {
+static void _audio_deinit(void)
+{
     // Stop the source (this should mark all queued buffers as processed)
     alSourceStop(al_source);
 
@@ -72,10 +81,17 @@ static void _audio_deinit(void) {
     }
 
     alDeleteSources(1, &al_source);
-    alcDestroyContext(al_context);
-    alcCloseDevice(al_device);
+    if (al_context) {
+        alcDestroyContext(al_context);
+        al_context = NULL;
+    }
+    
+    if (al_device) {
+        alcCloseDevice(al_device);
+        al_device = NULL;
+    }
 
-    if (audio_buffer != NULL) {
+    if (audio_buffer) {
         free(audio_buffer);
         audio_buffer = NULL;
     }
@@ -86,7 +102,6 @@ static void free_processed_buffers(void)
     ALint processed;
     alGetSourcei(al_source, AL_BUFFERS_PROCESSED, &processed);
     if (AL_ERROR("Failed to query number of processed buffers")) {
-        _audio_deinit();
         return;
     }
 
@@ -95,13 +110,11 @@ static void free_processed_buffers(void)
 
         alSourceUnqueueBuffers(al_source, 1, &buffer);
         if (AL_ERROR("Failed to unqueue buffer")) {
-            _audio_deinit();
             return;
         }
 
         alDeleteBuffers(1, &buffer);
         if (AL_ERROR("Failed to delete buffer")) {
-            _audio_deinit();
             return;
         }
     }
@@ -112,7 +125,6 @@ static bool _audio_is_playing(void)
     ALenum state;
     alGetSourcei(al_source, AL_SOURCE_STATE, &state);
     if (AL_ERROR("Failed to query source state")) {
-        _audio_deinit();
         return false;
     }
 
@@ -121,16 +133,13 @@ static bool _audio_is_playing(void)
 
 static void _audio_set_paused(bool paused)
 {
+    is_paused = paused;
     if (paused) {
         alSourcePause(al_source);
     }
     else {
         alSourcePlay(al_source);
     }
-
-    if (AL_ERROR(NULL)) {
-        _audio_deinit();
-    }
 }
 
 static void _audio_clear_queue(void)
@@ -140,7 +149,6 @@ static void _audio_clear_queue(void)
     // Stopping a source clears its queue
     alSourceStop(al_source);
     if (AL_ERROR(NULL)) {
-        _audio_deinit();
         return;
     }
 
@@ -178,6 +186,7 @@ static size_t _audio_get_queue_length(void)
 
 static void _audio_queue_sample(GB_sample_t *sample)
 {
+    if (is_paused) return;
     audio_buffer[buffer_pos++] = *sample;
 
     if (buffer_pos == buffer_size) {
@@ -186,17 +195,17 @@ static void _audio_queue_sample(GB_sample_t *sample)
         ALuint al_buffer;
         alGenBuffers(1, &al_buffer);
         if (AL_ERROR("Failed to create audio buffer")) {
-            return _audio_deinit();
+            return;
         }
 
         alBufferData(al_buffer, AL_FORMAT_STEREO16, audio_buffer, buffer_size * sizeof(GB_sample_t), sample_rate);
         if (AL_ERROR("Failed to buffer data")) {
-            return _audio_deinit();
+            return;
         }
 
         alSourceQueueBuffers(al_source, 1, &al_buffer);
         if (AL_ERROR("Failed to queue buffer")) {
-            return _audio_deinit();
+            return;
         }
 
         // In case of an audio underrun, the source might
@@ -240,6 +249,9 @@ static bool _audio_init(void)
         _audio_deinit();
         return false;
     }
+    if (sample_rate == 0) {
+        sample_rate = 48000;
+    }
 
     // Allocate our working buffer
     buffer_size = (sample_rate * BUFFER_LEN_MS) / 1000;

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.