Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Merge pull request #4068 from bollu/AudioArtefactFix"

Browse source 
This reverts commit e4c6ba9b01, reversing
changes made to 061efd35db.
This commit is contained in:
Henrik Rydgard 2013-10-07 20:25:35 +02:00
parent f645988b8f
commit f938b95925
5 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/HLE/__sceAudio.cpp
View file

@ -381,7 +381,7 @@ int __AudioMix(short *outstereo, int numFrames)
{
if(!__gainAudioQueueLock()){
return SCE_AUDIO_NO_MIX;
return numFrames;
}

3
Core/HLE/__sceAudio.h
View file

@ -17,9 +17,6 @@
#pragma once
#include "sceAudio.h"
#ifndef SCE_AUDIO_NO_MIX
#define SCE_AUDIO_NO_MIX -1
#endif
// Easy interface for sceAudio to write to, to keep the complexity in check.

2
Core/PSPMixer.cpp
View file

@ -28,7 +28,7 @@ int PSPMixer::Mix(short *stereoout, int numSamples)
{
int numFrames = __AudioMix(stereoout, numSamples);
#ifdef _WIN32
if (numFrames < numSamples && numFrames != SCE_AUDIO_NO_MIX) {
if (numFrames < numSamples) {
// Our dsound backend will not stop playing, let's just feed it zeroes if we miss data.
memset(stereoout + 2 * 2 * numFrames, 0, 2 * 2 * (numSamples - numFrames));
numFrames = numSamples;

4
Core/PSPMixer.h
View file

@ -20,10 +20,6 @@
#include "MemMap.h"
#include "Host.h"
#ifndef SCE_AUDIO_NO_MIX
#define SCE_AUDIO_NO_MIX -1
#endif
class PSPMixer : public PMixer
{
public:

16
UI/NativeApp.cpp
View file

@ -194,23 +194,13 @@ void NativeHost::ShutdownSound() {
int NativeMix(short *audio, int num_samples) {
// ILOG("Entering mixer");
int numMixedSamples = 0;
if (g_mixer) {
numMixedSamples = g_mixer->Mix(audio, num_samples);
if(numMixedSamples == SCE_AUDIO_NO_MIX) {
goto noMix;
}
} else{
//this is the one place a goto is warranted. Still, find a way to rewrite
//;_;
noMix:
num_samples = g_mixer->Mix(audio, num_samples);
} else {
memset(audio, 0, num_samples * 2 * sizeof(short));
}
// ILOG("Leaving mixer");
return numMixedSamples;
return num_samples;
}
void NativeGetAppInfo(std::string *app_dir_name, std::string *app_nice_name, bool *landscape) {