Macintosh-Tools/Pomme
1
0
Fork 0
mirror of https://github.com/jorio/Pomme.git synced 2025-02-16 16:30:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix memory leak in SndStartFilePlay

Browse Source
This commit is contained in:
Iliyas Jorio 2022-02-23 23:20:47 +01:00
parent d8e7457b95
commit 08dd1e61b6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SoundMixer/SoundManager.cpp
View File

@ -119,7 +119,7 @@ OSErr SndChannelStatus(SndChannelPtr chan, short theLength, SCStatusPtr theStatu
}
// Install a sampled sound as a voice in a channel.
static void InstallSoundInChannel(SndChannelPtr chan, const Ptr sampledSoundHeader)
static void InstallSoundInChannel(SndChannelPtr chan, const Ptr sampledSoundHeader, bool forceCopy=false)
{
//---------------------------------
// Get internal channel
@ -146,6 +146,12 @@ static void InstallSoundInChannel(SndChannelPtr chan, const Ptr sampledSoundHead
codec->Decode(info.nChannels, spanIn, spanOut);
impl.source.Init(info.sampleRate, 16, info.nChannels, false, spanOut);
}
else if (forceCopy)
{
auto spanOut = impl.source.GetBuffer(info.decompressedLength);
memcpy(spanOut.data(), spanIn.data(), spanIn.size());
impl.source.Init(info.sampleRate, info.codecBitDepth, info.nChannels, info.bigEndian, spanOut);
}
else
{
impl.source.Init(info.sampleRate, info.codecBitDepth, info.nChannels, info.bigEndian, spanIn);
@ -313,7 +319,9 @@ OSErr SndStartFilePlay(
SndListHandle sndListHandle = Pomme_SndLoadFileAsResource(fRefNum);
long offset = 0;
GetSoundHeaderOffset(sndListHandle, &offset);
InstallSoundInChannel(chan, ((Ptr) *sndListHandle) + offset);
InstallSoundInChannel(chan, ((Ptr) *sndListHandle) + offset, true);
DisposeHandle((Handle) sndListHandle);
sndListHandle = nullptr;
auto& impl = GetChannelImpl(chan);
if (theCompletion)