mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors due to preprocessor if/endif mismatching.

Browse Source
This commit is contained in:
David Reid
2020-01-14 18:41:25 +10:00
parent 6cff872b12
commit 5085eb8acc
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+15 -10
View File
@@ -1,6 +1,6 @@
/* /*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file. Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio (formerly mini_al) - v0.9.9 - 2020-01-09 miniaudio (formerly mini_al) - v0.9.10 - 2020-01-xx
David Reid - davidreidsoftware@gmail.com David Reid - davidreidsoftware@gmail.com
@@ -3390,10 +3390,11 @@ IMPLEMENTATION
#include <math.h> /* sin(), etc. */ #include <math.h> /* sin(), etc. */
#if !defined(MA_NO_STDIO) || defined(MA_DEBUG_OUTPUT) #if !defined(MA_NO_STDIO) || defined(MA_DEBUG_OUTPUT)
#include <stdio.h> #include <stdio.h>
#if !defined(_MSC_VER) && !defined(__DMC__) #if !defined(_MSC_VER) && !defined(__DMC__)
#include <strings.h> /* For strcasecmp(). */ #include <strings.h> /* For strcasecmp(). */
#include <wchar.h> /* For wcslen(), wcsrtombs() */ #include <wchar.h> /* For wcslen(), wcsrtombs() */
#endif
#endif #endif
#ifdef MA_WIN32 #ifdef MA_WIN32
@@ -34098,7 +34099,7 @@ ma_result ma_decoder_init_wav__internal(const ma_decoder_config* pConfig, ma_dec
return MA_SUCCESS; return MA_SUCCESS;
} }
#endif #endif /* dr_wav_h */
/* FLAC */ /* FLAC */
#ifdef dr_flac_h #ifdef dr_flac_h
@@ -34215,7 +34216,7 @@ ma_result ma_decoder_init_flac__internal(const ma_decoder_config* pConfig, ma_de
return MA_SUCCESS; return MA_SUCCESS;
} }
#endif #endif /* dr_flac_h */
/* Vorbis */ /* Vorbis */
#ifdef STB_VORBIS_INCLUDE_STB_VORBIS_H #ifdef STB_VORBIS_INCLUDE_STB_VORBIS_H
@@ -34517,7 +34518,7 @@ ma_result ma_decoder_init_vorbis__internal(const ma_decoder_config* pConfig, ma_
return MA_SUCCESS; return MA_SUCCESS;
} }
#endif #endif /* STB_VORBIS_INCLUDE_STB_VORBIS_H */
/* MP3 */ /* MP3 */
#ifdef dr_mp3_h #ifdef dr_mp3_h
@@ -34638,7 +34639,7 @@ ma_result ma_decoder_init_mp3__internal(const ma_decoder_config* pConfig, ma_dec
return MA_SUCCESS; return MA_SUCCESS;
} }
#endif #endif /* dr_mp3_h */
/* Raw */ /* Raw */
ma_uint32 ma_decoder_internal_on_read_pcm_frames__raw(ma_pcm_converter* pDSP, void* pFramesOut, ma_uint32 frameCount, void* pUserData) ma_uint32 ma_decoder_internal_on_read_pcm_frames__raw(ma_pcm_converter* pDSP, void* pFramesOut, ma_uint32 frameCount, void* pUserData)
@@ -35094,6 +35095,7 @@ ma_result ma_decoder_init_memory_raw(const void* pData, size_t dataSize, const m
return ma_decoder_init_raw__internal(pConfigIn, &config, pDecoder); return ma_decoder_init_raw__internal(pConfigIn, &config, pDecoder);
} }
#ifndef MA_NO_STDIO
const char* ma_path_file_name(const char* path) const char* ma_path_file_name(const char* path)
{ {
const char* fileName; const char* fileName;
@@ -35554,7 +35556,7 @@ ma_result ma_decoder_init_file_mp3_w(const wchar_t* pFilePath, const ma_decoder_
return ma_decoder_init_mp3(ma_decoder__on_read_stdio, ma_decoder__on_seek_stdio, pDecoder->pUserData, pConfig, pDecoder); return ma_decoder_init_mp3(ma_decoder__on_read_stdio, ma_decoder__on_seek_stdio, pDecoder->pUserData, pConfig, pDecoder);
} }
#endif #endif /* MA_NO_STDIO */
ma_result ma_decoder_uninit(ma_decoder* pDecoder) ma_result ma_decoder_uninit(ma_decoder* pDecoder)
{ {
@@ -35854,6 +35856,9 @@ Device
/* /*
REVISION HISTORY REVISION HISTORY
================ ================
v0.9.10 - 2020-01-xx
- Fix compilation errors due to #if/#endif mismatches.
v0.9.9 - 2020-01-09 v0.9.9 - 2020-01-09
- Fix compilation errors with MinGW. - Fix compilation errors with MinGW.
- Fix compilation errors when compiling on Apple platforms. - Fix compilation errors when compiling on Apple platforms.