MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PR Feedback, use custom unload for sound alias, not variant of normal sound unloading

Browse Source
This commit is contained in:
Jeff Myers 2023-08-04 07:33:41 -07:00
parent 6a6373b019
commit f9e8c13e36
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/raudio.c
View File

@ -420,7 +420,7 @@ static bool SaveFileText(const char *fileName, char *text); // Save text
// NOTE: Those functions are not exposed by raylib... for the moment // NOTE: Those functions are not exposed by raylib... for the moment
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
AudioBuffer *LoadAudioBuffer(ma_format format, ma_uint32 channels, ma_uint32 sampleRate, ma_uint32 sizeInFrames, int usage); AudioBuffer *LoadAudioBuffer(ma_format format, ma_uint32 channels, ma_uint32 sampleRate, ma_uint32 sizeInFrames, int usage);
void UnloadAudioBuffer(AudioBuffer *buffer, bool freeSampleData); void UnloadAudioBuffer(AudioBuffer *buffer);
bool IsAudioBufferPlaying(AudioBuffer *buffer); bool IsAudioBufferPlaying(AudioBuffer *buffer);
void PlayAudioBuffer(AudioBuffer *buffer); void PlayAudioBuffer(AudioBuffer *buffer);
@ -591,14 +591,13 @@ AudioBuffer *LoadAudioBuffer(ma_format format, ma_uint32 channels, ma_uint32 sam
} }
// Delete an audio buffer // Delete an audio buffer
void UnloadAudioBuffer(AudioBuffer *buffer, bool freeSampleData) void UnloadAudioBuffer(AudioBuffer *buffer)
{ {
if (buffer != NULL) if (buffer != NULL)
{ {
ma_data_converter_uninit(&buffer->converter, NULL); ma_data_converter_uninit(&buffer->converter, NULL);
UntrackAudioBuffer(buffer); UntrackAudioBuffer(buffer);
if (freeSampleData) RL_FREE(buffer->data);
RL_FREE(buffer->data);
RL_FREE(buffer); RL_FREE(buffer);
} }
} }
@ -963,14 +962,19 @@ void UnloadWave(Wave wave)
// Unload sound // Unload sound
void UnloadSound(Sound sound) void UnloadSound(Sound sound)
{ {
UnloadAudioBuffer(sound.stream.buffer, true); UnloadAudioBuffer(sound.stream.buffer);
//TRACELOG(LOG_INFO, "SOUND: Unloaded sound data from RAM"); //TRACELOG(LOG_INFO, "SOUND: Unloaded sound data from RAM");
} }
void UnloadSoundAlias(Sound alias) void UnloadSoundAlias(Sound alias)
{ {
UnloadAudioBuffer(alias.stream.buffer, false); // untrack and unload just the sound buffer, not the sample data, it is shared with the source for the alias
//TRACELOG(LOG_INFO, "SOUND: Unloaded sound data from RAM"); if (alias.stream.buffer != NULL)
{
ma_data_converter_uninit(&alias.stream.buffer->converter, NULL);
UntrackAudioBuffer(alias.stream.buffer);
RL_FREE(alias.stream.buffer);
}
} }
// Update sound buffer with new data // Update sound buffer with new data
@ -2060,7 +2064,7 @@ bool IsAudioStreamReady(AudioStream stream)
// Unload audio stream and free memory // Unload audio stream and free memory
void UnloadAudioStream(AudioStream stream) void UnloadAudioStream(AudioStream stream)
{ {
UnloadAudioBuffer(stream.buffer, true); UnloadAudioBuffer(stream.buffer);
TRACELOG(LOG_INFO, "STREAM: Unloaded audio stream data from RAM"); TRACELOG(LOG_INFO, "STREAM: Unloaded audio stream data from RAM");
} }