Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
eb278267
Commit
eb278267
authored
Jun 14, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for the VC6 build.
parent
33aec2fc
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
54 additions
and
7 deletions
+54
-7
miniaudio.h
miniaudio.h
+54
-7
No files found.
miniaudio.h
View file @
eb278267
...
@@ -5242,6 +5242,13 @@ MA_API void ma_silence_pcm_frames(void* p, ma_uint64 frameCount, ma_format forma
...
@@ -5242,6 +5242,13 @@ MA_API void ma_silence_pcm_frames(void* p, ma_uint64 frameCount, ma_format forma
static MA_INLINE void ma_zero_pcm_frames(void* p, ma_uint64 frameCount, ma_format format, ma_uint32 channels) { ma_silence_pcm_frames(p, frameCount, format, channels); }
static MA_INLINE void ma_zero_pcm_frames(void* p, ma_uint64 frameCount, ma_format format, ma_uint32 channels) { ma_silence_pcm_frames(p, frameCount, format, channels); }
/*
Offsets a pointer by the specified number of PCM frames.
*/
MA_API void* ma_offset_pcm_frames_ptr(void* p, ma_uint64 offsetInFrames, ma_format format, ma_uint32 channels);
MA_API const void* ma_offset_pcm_frames_const_ptr(const void* p, ma_uint64 offsetInFrames, ma_format format, ma_uint32 channels);
/*
/*
Clips f32 samples.
Clips f32 samples.
*/
*/
...
@@ -5748,6 +5755,8 @@ IMPLEMENTATION
...
@@ -5748,6 +5755,8 @@ IMPLEMENTATION
#include <string.h> /* For memset() */
#include <string.h> /* For memset() */
#endif
#endif
#include <sys/stat.h> /* For fstat(), etc. */
#ifdef MA_EMSCRIPTEN
#ifdef MA_EMSCRIPTEN
#include <emscripten/emscripten.h>
#include <emscripten/emscripten.h>
#endif
#endif
...
@@ -8240,11 +8249,19 @@ static void ma_sleep(ma_uint32 milliseconds)
...
@@ -8240,11 +8249,19 @@ static void ma_sleep(ma_uint32 milliseconds)
#endif
#endif
#if !defined(MA_EMSCRIPTEN)
#if !defined(MA_EMSCRIPTEN)
static void ma_yield()
static
MA_INLINE
void ma_yield()
{
{
#ifdef MA_POSIX
#ifdef MA_POSIX
posix_yield();
posix_yield();
#else
#else
#if defined(MA_X86) || defined(MA_X64)
#if defined(_MSC_VER) && _MSC_VER >= 1400
_mm_pause();
#else
__asm pause;
#endif
#endif
/* TODO: Implement me. x86 = PAUSE; ARM = YIELD; */
/* TODO: Implement me. x86 = PAUSE; ARM = YIELD; */
#endif
#endif
}
}
...
@@ -8326,6 +8343,7 @@ MA_API ma_result ma_event_init(ma_event* pEvent)
...
@@ -8326,6 +8343,7 @@ MA_API ma_result ma_event_init(ma_event* pEvent)
#endif
#endif
}
}
#if 0
static ma_result ma_event_alloc_and_init(ma_event** ppEvent, ma_allocation_callbacks* pAllocationCallbacks)
static ma_result ma_event_alloc_and_init(ma_event** ppEvent, ma_allocation_callbacks* pAllocationCallbacks)
{
{
ma_result result;
ma_result result;
...
@@ -8351,6 +8369,7 @@ static ma_result ma_event_alloc_and_init(ma_event** ppEvent, ma_allocation_callb
...
@@ -8351,6 +8369,7 @@ static ma_result ma_event_alloc_and_init(ma_event** ppEvent, ma_allocation_callb
*ppEvent = pEvent;
*ppEvent = pEvent;
return result;
return result;
}
}
#endif
MA_API void ma_event_uninit(ma_event* pEvent)
MA_API void ma_event_uninit(ma_event* pEvent)
{
{
...
@@ -8366,6 +8385,7 @@ MA_API void ma_event_uninit(ma_event* pEvent)
...
@@ -8366,6 +8385,7 @@ MA_API void ma_event_uninit(ma_event* pEvent)
#endif
#endif
}
}
#if 0
static void ma_event_uninit_and_free(ma_event* pEvent, ma_allocation_callbacks* pAllocationCallbacks)
static void ma_event_uninit_and_free(ma_event* pEvent, ma_allocation_callbacks* pAllocationCallbacks)
{
{
if (pEvent == NULL) {
if (pEvent == NULL) {
...
@@ -8375,6 +8395,7 @@ static void ma_event_uninit_and_free(ma_event* pEvent, ma_allocation_callbacks*
...
@@ -8375,6 +8395,7 @@ static void ma_event_uninit_and_free(ma_event* pEvent, ma_allocation_callbacks*
ma_event_uninit(pEvent);
ma_event_uninit(pEvent);
ma_free(pEvent, pAllocationCallbacks/*, MA_ALLOCATION_TYPE_EVENT*/);
ma_free(pEvent, pAllocationCallbacks/*, MA_ALLOCATION_TYPE_EVENT*/);
}
}
#endif
MA_API ma_result ma_event_wait(ma_event* pEvent)
MA_API ma_result ma_event_wait(ma_event* pEvent)
{
{
...
@@ -24640,7 +24661,6 @@ sndio Backend
...
@@ -24640,7 +24661,6 @@ sndio Backend
******************************************************************************/
******************************************************************************/
#ifdef MA_HAS_SNDIO
#ifdef MA_HAS_SNDIO
#include <fcntl.h>
#include <fcntl.h>
#include <sys/stat.h>
/*
/*
Only supporting OpenBSD. This did not work very well at all on FreeBSD when I tried it. Not sure if this is due
Only supporting OpenBSD. This did not work very well at all on FreeBSD when I tried it. Not sure if this is due
...
@@ -31002,6 +31022,17 @@ MA_API void ma_silence_pcm_frames(void* p, ma_uint64 frameCount, ma_format forma
...
@@ -31002,6 +31022,17 @@ MA_API void ma_silence_pcm_frames(void* p, ma_uint64 frameCount, ma_format forma
}
}
}
}
MA_API void* ma_offset_pcm_frames_ptr(void* p, ma_uint64 offsetInFrames, ma_format format, ma_uint32 channels)
{
return ma_offset_ptr(p, offsetInFrames * ma_get_bytes_per_frame(format, channels));
}
MA_API const void* ma_offset_pcm_frames_const_ptr(const void* p, ma_uint64 offsetInFrames, ma_format format, ma_uint32 channels)
{
return ma_offset_ptr(p, offsetInFrames * ma_get_bytes_per_frame(format, channels));
}
MA_API void ma_clip_samples_f32(float* p, ma_uint64 sampleCount)
MA_API void ma_clip_samples_f32(float* p, ma_uint64 sampleCount)
{
{
ma_uint32 iSample;
ma_uint32 iSample;
...
@@ -37466,7 +37497,7 @@ static ma_result ma_channel_converter_process_pcm_frames__stereo_to_mono(ma_chan
...
@@ -37466,7 +37497,7 @@ static ma_result ma_channel_converter_process_pcm_frames__stereo_to_mono(ma_chan
const ma_uint8* pFramesInU8 = (const ma_uint8*)pFramesIn;
const ma_uint8* pFramesInU8 = (const ma_uint8*)pFramesIn;
for (iFrame = 0; iFrame < frameCount; ++iFrame) {
for (iFrame = 0; iFrame < frameCount; ++iFrame) {
pFramesOutU8[iFrame] = ma_clip_u8((ma_
pcm_sample_u8_to_s16_no_scale(pFramesInU8[iFrame*2+0]) + ma_pcm_sample_u8_to_s16_no_scale(pFramesInU8[iFrame*2+1])) / 2
);
pFramesOutU8[iFrame] = ma_clip_u8((ma_
int16)((ma_pcm_sample_u8_to_s16_no_scale(pFramesInU8[iFrame*2+0]) + ma_pcm_sample_u8_to_s16_no_scale(pFramesInU8[iFrame*2+1])) / 2)
);
}
}
} break;
} break;
...
@@ -40936,7 +40967,16 @@ static ma_result ma_default_vfs_seek__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_i
...
@@ -40936,7 +40967,16 @@ static ma_result ma_default_vfs_seek__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_i
(void)pVFS;
(void)pVFS;
#if defined(_WIN32)
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER > 1200
result = _fseeki64((FILE*)file, offset, origin);
result = _fseeki64((FILE*)file, offset, origin);
#else
/* No _fseeki64() so restrict to 31 bits. */
if (origin > 0x7FFFFFFF) {
return MA_OUT_OF_RANGE;
}
result = fseek((FILE*)file, (int)offset, origin);
#endif
#else
#else
result = fseek((FILE*)file, (long int)offset, origin);
result = fseek((FILE*)file, (long int)offset, origin);
#endif
#endif
...
@@ -40957,7 +40997,11 @@ static ma_result ma_default_vfs_tell__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_i
...
@@ -40957,7 +40997,11 @@ static ma_result ma_default_vfs_tell__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_i
(void)pVFS;
(void)pVFS;
#if defined(_WIN32)
#if defined(_WIN32)
#if defined(_MSC_VER) && _MSC_VER > 1200
result = _ftelli64((FILE*)file);
result = _ftelli64((FILE*)file);
#else
result = ftell((FILE*)file);
#endif
#else
#else
result = ftell((FILE*)file);
result = ftell((FILE*)file);
#endif
#endif
...
@@ -40967,6 +41011,7 @@ static ma_result ma_default_vfs_tell__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_i
...
@@ -40967,6 +41011,7 @@ static ma_result ma_default_vfs_tell__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_i
return MA_SUCCESS;
return MA_SUCCESS;
}
}
#include <sys/stat.h>
static ma_result ma_default_vfs_info__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo)
static ma_result ma_default_vfs_info__stdio(ma_vfs* pVFS, ma_vfs_file file, ma_file_info* pInfo)
{
{
int fd;
int fd;
...
@@ -41109,7 +41154,6 @@ MA_API ma_result ma_default_vfs_init(ma_default_vfs* pVFS, const ma_allocation_c
...
@@ -41109,7 +41154,6 @@ MA_API ma_result ma_default_vfs_init(ma_default_vfs* pVFS, const ma_allocation_c
}
}
/**************************************************************************************************************************************************************
/**************************************************************************************************************************************************************
Decoding
Decoding
...
@@ -44088,7 +44132,7 @@ MA_API ma_result ma_waveform_seek_to_pcm_frame(ma_waveform* pWaveform, ma_uint64
...
@@ -44088,7 +44132,7 @@ MA_API ma_result ma_waveform_seek_to_pcm_frame(ma_waveform* pWaveform, ma_uint64
return MA_INVALID_ARGS;
return MA_INVALID_ARGS;
}
}
pWaveform->time = pWaveform->advance *
frameIndex;
pWaveform->time = pWaveform->advance *
(ma_int64)frameIndex; /* Casting for VC6. Won't be an issue in practice. */
return MA_SUCCESS;
return MA_SUCCESS;
}
}
...
@@ -44644,10 +44688,13 @@ v0.10.8 - TBD
...
@@ -44644,10 +44688,13 @@ v0.10.8 - TBD
- Add support for memory mapping to ma_data_source.
- Add support for memory mapping to ma_data_source.
- ma_data_source_map()
- ma_data_source_map()
- ma_data_source_unmap()
- ma_data_source_unmap()
- Add ma_offset_pcm_frames_ptr() and ma_offset_pcm_frames_const_ptr() which can be used for offsetting a pointer by a specified number of PCM frames.
- Add initial implementation of ma_yield() which is useful for spin locks which will be used in some upcoming work.
- Add documentation for log levels.
- Add documentation for log levels.
- Fix some bugs with the linear resampler when dynamically changing the sample rate.
- Fix some bugs with the linear resampler when dynamically changing the sample rate.
- Fix compilation errors with MA_NO_DEVICE_IO.
- Fix compilation errors with MA_NO_DEVICE_IO.
- Fix some warnings with GCC and -std=c89.
- Fix some warnings with GCC and -std=c89.
- Fix some warnings with VC6.
- Minor optimization to ma_copy_pcm_frames(). This is now a no-op when the input and output buffers are the same.
- Minor optimization to ma_copy_pcm_frames(). This is now a no-op when the input and output buffers are the same.
v0.10.7 - 2020-05-25
v0.10.7 - 2020-05-25
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment