From d63e32a377d00ff5defdcc15f0766456255b85fb Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 11 Jun 2016 11:21:24 +0200 Subject: Remove include, not supported on html5 AL/alext.h is not supported on html5 OpenAL implementation, just replaced by the defines used in audio module --- src/audio.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/audio.c') diff --git a/src/audio.c b/src/audio.c index 958b9838..e06994b8 100644 --- a/src/audio.c +++ b/src/audio.c @@ -37,12 +37,18 @@ #include "AL/al.h" // OpenAL basic header #include "AL/alc.h" // OpenAL context header (like OpenGL, OpenAL requires a context to work) -#include "AL/alext.h" // OpenAL extensions for other format types #include // Required for: malloc(), free() #include // Required for: strcmp(), strncmp() #include // Required for: FILE, fopen(), fclose(), fread() +#ifndef AL_FORMAT_MONO_FLOAT32 + #define AL_FORMAT_MONO_FLOAT32 0x10010 +#endif +#ifndef AL_FORMAT_STEREO_FLOAT32 + #define AL_FORMAT_STEREO_FLOAT32 0x10011 +#endif + #if defined(AUDIO_STANDALONE) #include // Required for: va_list, va_start(), vfprintf(), va_end() #else -- cgit v1.2.3 From 38847169480ea52e77a27949c139eca574ac2ba0 Mon Sep 17 00:00:00 2001 From: raysan5 Date: Sat, 11 Jun 2016 12:01:39 +0200 Subject: Corrected a couple of warnings --- src/audio.c | 1 - src/external/jar_mod.h | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/audio.c') diff --git a/src/audio.c b/src/audio.c index e06994b8..a76a453f 100644 --- a/src/audio.c +++ b/src/audio.c @@ -144,7 +144,6 @@ typedef enum { INFO = 0, ERROR, WARNING, DEBUG, OTHER } TraceLogType; //---------------------------------------------------------------------------------- static Music musicChannels_g[MAX_MUSIC_STREAMS]; // Current music loaded, up to two can play at the same time static MixChannel_t *mixChannels_g[MAX_MIX_CHANNELS]; // What mix channels are currently active -static bool musicEnabled_g = false; static int lastAudioError = 0; // Registers last audio error diff --git a/src/external/jar_mod.h b/src/external/jar_mod.h index e0169d5e..c39db65a 100644 --- a/src/external/jar_mod.h +++ b/src/external/jar_mod.h @@ -64,7 +64,7 @@ // - "Load" a MOD from file, context must already be initialized. // Return size of file in bytes. // ------------------------------------------- -// void jar_mod_fillbuffer( jar_mod_context_t * modctx, unsigned short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf ) +// void jar_mod_fillbuffer( jar_mod_context_t * modctx, short * outbuffer, unsigned long nbsample, jar_mod_tracker_buffer_state * trkbuf ) // // - Generate and return the next samples chunk to outbuffer. // nbsample specify the number of stereo 16bits samples you want. @@ -1557,7 +1557,7 @@ mulong jar_mod_current_samples(jar_mod_context_t * modctx) // Works, however it is very slow, this data should be cached to ensure it is run only once per file mulong jar_mod_max_samples(jar_mod_context_t * ctx) { - muint buff[2]; + mint buff[2]; mulong len; mulong lastcount = ctx->loopcount; -- cgit v1.2.3