Skip to content

M
miniaudio
Commit 76640272 authored by David Reid's avatar David Reid
Browse files
Options

Rename some APIs for consistency with other APIs. 

  * ma_sound_set_fade_in_frames()       > ma_sound_set_fade_in_pcm_frames()
  * ma_sound_get_time_in_frames()       > ma_sound_get_time_in_pcm_frames()
  * ma_sound_set_start_time()           > ma_sound_set_start_time_in_pcm_frames()
  * ma_sound_set_stop_time()            > ma_sound_set_stop_time_in_pcm_frames()
  * ma_sound_group_set_fade_in_frames() > ma_sound_group_set_fade_in_pcm_frames()
  * ma_sound_group_get_time_in_frames() > ma_sound_group_get_time_in_pcm_frames()
  * ma_sound_group_set_start_time()     > ma_sound_group_set_start_time_in_pcm_frames()
  * ma_sound_group_set_stop_time()      > ma_sound_group_set_stop_time_in_pcm_frames()
parent cc2365b2
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
research/miniaudio_engine.h
View file @ 76640272
...@@ -1795,14 +1795,14 @@ MA_API void ma_sound_set_doppler_factor(ma_sound* pSound, float dopplerFactor); ...@@ -1795,14 +1795,14 @@ MA_API void ma_sound_set_doppler_factor(ma_sound* pSound, float dopplerFactor);
MA_API float ma_sound_get_doppler_factor(const ma_sound* pSound); MA_API float ma_sound_get_doppler_factor(const ma_sound* pSound);
MA_API ma_result ma_sound_set_looping(ma_sound* pSound, ma_bool8 isLooping); MA_API ma_result ma_sound_set_looping(ma_sound* pSound, ma_bool8 isLooping);
MA_API ma_bool32 ma_sound_is_looping(const ma_sound* pSound); MA_API ma_bool32 ma_sound_is_looping(const ma_sound* pSound);
MA_API ma_result ma_sound_set_fade_in_frames(ma_sound* pSound, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames); MA_API ma_result ma_sound_set_fade_in_pcm_frames(ma_sound* pSound, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames);
MA_API ma_result ma_sound_set_fade_in_milliseconds(ma_sound* pSound, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInMilliseconds); MA_API ma_result ma_sound_set_fade_in_milliseconds(ma_sound* pSound, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInMilliseconds);
MA_API ma_result ma_sound_get_current_fade_volume(ma_sound* pSound, float* pVolume); MA_API ma_result ma_sound_get_current_fade_volume(ma_sound* pSound, float* pVolume);
MA_API ma_result ma_sound_set_start_time(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames); MA_API ma_result ma_sound_set_start_time_in_pcm_frames(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames);
MA_API ma_result ma_sound_set_stop_time(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames); MA_API ma_result ma_sound_set_stop_time_in_pcm_frames(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames);
MA_API ma_bool32 ma_sound_is_playing(const ma_sound* pSound); MA_API ma_bool32 ma_sound_is_playing(const ma_sound* pSound);
MA_API ma_bool32 ma_sound_at_end(const ma_sound* pSound); MA_API ma_bool32 ma_sound_at_end(const ma_sound* pSound);
MA_API ma_result ma_sound_get_time_in_frames(const ma_sound* pSound, ma_uint64* pTimeInFrames); MA_API ma_result ma_sound_get_time_in_pcm_frames(const ma_sound* pSound, ma_uint64* pTimeInFrames);
MA_API ma_result ma_sound_seek_to_pcm_frame(ma_sound* pSound, ma_uint64 frameIndex); /* Just a wrapper around ma_data_source_seek_to_pcm_frame(). */ MA_API ma_result ma_sound_seek_to_pcm_frame(ma_sound* pSound, ma_uint64 frameIndex); /* Just a wrapper around ma_data_source_seek_to_pcm_frame(). */
MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate); MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat, ma_uint32* pChannels, ma_uint32* pSampleRate);
MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor); MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor);
...@@ -1841,13 +1841,13 @@ MA_API void ma_sound_group_set_cone(ma_sound_group* pGroup, float innerAngleInRa ...@@ -1841,13 +1841,13 @@ MA_API void ma_sound_group_set_cone(ma_sound_group* pGroup, float innerAngleInRa
MA_API void ma_sound_group_get_cone(const ma_sound_group* pGroup, float* pInnerAngleInRadians, float* pOuterAngleInRadians, float* pOuterGain); MA_API void ma_sound_group_get_cone(const ma_sound_group* pGroup, float* pInnerAngleInRadians, float* pOuterAngleInRadians, float* pOuterGain);
MA_API void ma_sound_group_set_doppler_factor(ma_sound_group* pGroup, float dopplerFactor); MA_API void ma_sound_group_set_doppler_factor(ma_sound_group* pGroup, float dopplerFactor);
MA_API float ma_sound_group_get_doppler_factor(const ma_sound_group* pGroup); MA_API float ma_sound_group_get_doppler_factor(const ma_sound_group* pGroup);
MA_API ma_result ma_sound_group_set_fade_in_frames(ma_sound_group* pGroup, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames); MA_API ma_result ma_sound_group_set_fade_in_pcm_frames(ma_sound_group* pGroup, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames);
MA_API ma_result ma_sound_group_set_fade_in_milliseconds(ma_sound_group* pGroup, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInMilliseconds); MA_API ma_result ma_sound_group_set_fade_in_milliseconds(ma_sound_group* pGroup, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInMilliseconds);
MA_API ma_result ma_sound_group_get_current_fade_volume(ma_sound_group* pGroup, float* pVolume); MA_API ma_result ma_sound_group_get_current_fade_volume(ma_sound_group* pGroup, float* pVolume);
MA_API ma_result ma_sound_group_set_start_time(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames); MA_API ma_result ma_sound_group_set_start_time_in_pcm_frames(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames);
MA_API ma_result ma_sound_group_set_stop_time(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames); MA_API ma_result ma_sound_group_set_stop_time_in_pcm_frames(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames);
MA_API ma_bool32 ma_sound_group_is_playing(const ma_sound_group* pGroup); MA_API ma_bool32 ma_sound_group_is_playing(const ma_sound_group* pGroup);
MA_API ma_result ma_sound_group_get_time_in_frames(const ma_sound_group* pGroup, ma_uint64* pTimeInFrames); MA_API ma_result ma_sound_group_get_time_in_pcm_frames(const ma_sound_group* pGroup, ma_uint64* pTimeInFrames);
#ifdef __cplusplus #ifdef __cplusplus
} }
...@@ -11405,7 +11405,7 @@ MA_API ma_bool32 ma_sound_is_looping(const ma_sound* pSound) ...@@ -11405,7 +11405,7 @@ MA_API ma_bool32 ma_sound_is_looping(const ma_sound* pSound)
} }
MA_API ma_result ma_sound_set_fade_in_frames(ma_sound* pSound, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames) MA_API ma_result ma_sound_set_fade_in_pcm_frames(ma_sound* pSound, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames)
{ {
if (pSound == NULL) { if (pSound == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11420,7 +11420,7 @@ MA_API ma_result ma_sound_set_fade_in_milliseconds(ma_sound* pSound, float volum ...@@ -11420,7 +11420,7 @@ MA_API ma_result ma_sound_set_fade_in_milliseconds(ma_sound* pSound, float volum
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
return ma_sound_set_fade_in_frames(pSound, volumeBeg, volumeEnd, (fadeLengthInMilliseconds * pSound->engineNode.fader.config.sampleRate) / 1000); return ma_sound_set_fade_in_pcm_frames(pSound, volumeBeg, volumeEnd, (fadeLengthInMilliseconds * pSound->engineNode.fader.config.sampleRate) / 1000);
} }
MA_API ma_result ma_sound_get_current_fade_volume(ma_sound* pSound, float* pVolume) MA_API ma_result ma_sound_get_current_fade_volume(ma_sound* pSound, float* pVolume)
...@@ -11432,7 +11432,7 @@ MA_API ma_result ma_sound_get_current_fade_volume(ma_sound* pSound, float* pVolu ...@@ -11432,7 +11432,7 @@ MA_API ma_result ma_sound_get_current_fade_volume(ma_sound* pSound, float* pVolu
return ma_fader_get_current_volume(&pSound->engineNode.fader, pVolume); return ma_fader_get_current_volume(&pSound->engineNode.fader, pVolume);
} }
MA_API ma_result ma_sound_set_start_time(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames) MA_API ma_result ma_sound_set_start_time_in_pcm_frames(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames)
{ {
if (pSound == NULL) { if (pSound == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11441,7 +11441,7 @@ MA_API ma_result ma_sound_set_start_time(ma_sound* pSound, ma_uint64 absoluteGlo ...@@ -11441,7 +11441,7 @@ MA_API ma_result ma_sound_set_start_time(ma_sound* pSound, ma_uint64 absoluteGlo
return ma_node_set_state_time(pSound, ma_node_state_started, absoluteGlobalTimeInFrames); return ma_node_set_state_time(pSound, ma_node_state_started, absoluteGlobalTimeInFrames);
} }
MA_API ma_result ma_sound_set_stop_time(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames) MA_API ma_result ma_sound_set_stop_time_in_pcm_frames(ma_sound* pSound, ma_uint64 absoluteGlobalTimeInFrames)
{ {
if (pSound == NULL) { if (pSound == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11468,7 +11468,7 @@ MA_API ma_bool32 ma_sound_at_end(const ma_sound* pSound) ...@@ -11468,7 +11468,7 @@ MA_API ma_bool32 ma_sound_at_end(const ma_sound* pSound)
return c89atomic_load_8((ma_bool8*)&pSound->atEnd); return c89atomic_load_8((ma_bool8*)&pSound->atEnd);
} }
MA_API ma_result ma_sound_get_time_in_frames(const ma_sound* pSound, ma_uint64* pTimeInFrames) MA_API ma_result ma_sound_get_time_in_pcm_frames(const ma_sound* pSound, ma_uint64* pTimeInFrames)
{ {
if (pTimeInFrames == NULL) { if (pTimeInFrames == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11893,7 +11893,7 @@ MA_API float ma_sound_group_get_doppler_factor(const ma_sound_group* pGroup) ...@@ -11893,7 +11893,7 @@ MA_API float ma_sound_group_get_doppler_factor(const ma_sound_group* pGroup)
return ma_spatializer_get_doppler_factor(&pGroup->engineNode.spatializer); return ma_spatializer_get_doppler_factor(&pGroup->engineNode.spatializer);
} }
MA_API ma_result ma_sound_group_set_fade_in_frames(ma_sound_group* pGroup, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames) MA_API ma_result ma_sound_group_set_fade_in_pcm_frames(ma_sound_group* pGroup, float volumeBeg, float volumeEnd, ma_uint64 fadeLengthInFrames)
{ {
if (pGroup == NULL) { if (pGroup == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11908,7 +11908,7 @@ MA_API ma_result ma_sound_group_set_fade_in_milliseconds(ma_sound_group* pGroup, ...@@ -11908,7 +11908,7 @@ MA_API ma_result ma_sound_group_set_fade_in_milliseconds(ma_sound_group* pGroup,
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
} }
return ma_sound_group_set_fade_in_frames(pGroup, volumeBeg, volumeEnd, (fadeLengthInMilliseconds * pGroup->engineNode.fader.config.sampleRate) / 1000); return ma_sound_group_set_fade_in_pcm_frames(pGroup, volumeBeg, volumeEnd, (fadeLengthInMilliseconds * pGroup->engineNode.fader.config.sampleRate) / 1000);
} }
MA_API ma_result ma_sound_group_get_current_fade_volume(ma_sound_group* pGroup, float* pVolume) MA_API ma_result ma_sound_group_get_current_fade_volume(ma_sound_group* pGroup, float* pVolume)
...@@ -11920,7 +11920,7 @@ MA_API ma_result ma_sound_group_get_current_fade_volume(ma_sound_group* pGroup, ...@@ -11920,7 +11920,7 @@ MA_API ma_result ma_sound_group_get_current_fade_volume(ma_sound_group* pGroup,
return ma_fader_get_current_volume(&pGroup->engineNode.fader, pVolume); return ma_fader_get_current_volume(&pGroup->engineNode.fader, pVolume);
} }
MA_API ma_result ma_sound_group_set_start_time(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames) MA_API ma_result ma_sound_group_set_start_time_in_pcm_frames(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames)
{ {
if (pGroup == NULL) { if (pGroup == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11929,7 +11929,7 @@ MA_API ma_result ma_sound_group_set_start_time(ma_sound_group* pGroup, ma_uint64 ...@@ -11929,7 +11929,7 @@ MA_API ma_result ma_sound_group_set_start_time(ma_sound_group* pGroup, ma_uint64
return ma_node_set_state_time(pGroup, ma_node_state_started, absoluteGlobalTimeInFrames); return ma_node_set_state_time(pGroup, ma_node_state_started, absoluteGlobalTimeInFrames);
} }
MA_API ma_result ma_sound_group_set_stop_time(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames) MA_API ma_result ma_sound_group_set_stop_time_in_pcm_frames(ma_sound_group* pGroup, ma_uint64 absoluteGlobalTimeInFrames)
{ {
if (pGroup == NULL) { if (pGroup == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -11947,7 +11947,7 @@ MA_API ma_bool32 ma_sound_group_is_playing(const ma_sound_group* pGroup) ...@@ -11947,7 +11947,7 @@ MA_API ma_bool32 ma_sound_group_is_playing(const ma_sound_group* pGroup)
return ma_node_get_state(pGroup) == ma_node_state_started; return ma_node_get_state(pGroup) == ma_node_state_started;
} }
MA_API ma_result ma_sound_group_get_time_in_frames(const ma_sound_group* pGroup, ma_uint64* pTimeInFrames) MA_API ma_result ma_sound_group_get_time_in_pcm_frames(const ma_sound_group* pGroup, ma_uint64* pTimeInFrames)
{ {
if (pTimeInFrames == NULL) { if (pTimeInFrames == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment