Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-28 07:50:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove duplicate Memset

Browse Source
This commit is contained in:
raven02 2014-02-15 18:37:34 +08:00
parent 7d9f1ff57a
commit c4a9952449
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/HLE/scePsmf.cpp
View File

@ -1245,18 +1245,18 @@ int scePsmfPlayerGetAudioData(u32 psmfPlayer, u32 audioDataAddr)
return ERROR_PSMF_NOT_INITIALIZED;
}
if (Memory::IsValidAddress(audioDataAddr)) {
Memory::Memset(audioDataAddr, 0, audioSamplesBytes);
}
if (psmfplayer->playMode == PSMF_PLAYER_MODE_PAUSE) {
INFO_LOG(HLE, "scePsmfPlayerGetAudioData(%08x): paused mode", psmfPlayer);
// Clear the audio when paused.
Memory::Memset(audioDataAddr, 0, audioSamplesBytes);
if (Memory::IsValidAddress(audioDataAddr)) {
Memory::Memset(audioDataAddr, 0, audioSamplesBytes);
}
return 0;
}
psmfplayer->mediaengine->getAudioSamples(audioDataAddr);
if (Memory::IsValidAddress(audioDataAddr)) {
psmfplayer->mediaengine->getAudioSamples(audioDataAddr);
}
int ret = psmfplayer->mediaengine->IsNoAudioData() ? (int)ERROR_PSMFPLAYER_NO_MORE_DATA : 0;
DEBUG_LOG(ME, "%08x=scePsmfPlayerGetAudioData(%08x, %08x)", ret, psmfPlayer, audioDataAddr);