mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Misc cleanup
This commit is contained in:
parent
8d70fd269e
commit
d981511459
2 changed files with 10 additions and 18 deletions
|
@ -331,15 +331,7 @@ void ADSREnvelope::SetSimpleEnvelope(u32 ADSREnv1, u32 ADSREnv2) {
|
|||
}
|
||||
}
|
||||
|
||||
SasInstance::SasInstance()
|
||||
: maxVoices(PSP_SAS_VOICES_MAX),
|
||||
sampleRate(44100),
|
||||
outputMode(PSP_SAS_OUTPUTMODE_MIXED),
|
||||
mixBuffer(0),
|
||||
sendBuffer(0),
|
||||
sendBufferDownsampled(0),
|
||||
sendBufferProcessed(0),
|
||||
grainSize(0) {
|
||||
SasInstance::SasInstance() {
|
||||
#ifdef AUDIO_TO_FILE
|
||||
audioDump = fopen("D:\\audio.raw", "wb");
|
||||
#endif
|
||||
|
|
|
@ -282,16 +282,16 @@ public:
|
|||
int GetGrainSize() const { return grainSize; }
|
||||
int EstimateMixUs();
|
||||
|
||||
int maxVoices;
|
||||
int sampleRate;
|
||||
int outputMode;
|
||||
int maxVoices = PSP_SAS_VOICES_MAX;
|
||||
int sampleRate = 44100;
|
||||
int outputMode = PSP_SAS_OUTPUTMODE_MIXED;
|
||||
|
||||
int *mixBuffer;
|
||||
int *sendBuffer;
|
||||
s16 *sendBufferDownsampled;
|
||||
s16 *sendBufferProcessed;
|
||||
int *mixBuffer = nullptr;
|
||||
int *sendBuffer = nullptr;
|
||||
s16 *sendBufferDownsampled = nullptr;
|
||||
s16 *sendBufferProcessed = nullptr;
|
||||
|
||||
FILE *audioDump;
|
||||
FILE *audioDump = nullptr;
|
||||
|
||||
void Mix(u32 outAddr, u32 inAddr = 0, int leftVol = 0, int rightVol = 0);
|
||||
void MixVoice(SasVoice &voice);
|
||||
|
@ -310,6 +310,6 @@ public:
|
|||
|
||||
private:
|
||||
SasReverb reverb_;
|
||||
int grainSize;
|
||||
int grainSize = 0;
|
||||
int16_t mixTemp_[PSP_SAS_MAX_GRAIN * 4 + 2 + 8]; // some extra margin for very high pitches.
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue