mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-12 11:08:56 +00:00
Cleanup AOSoundStream, fix audio pitch in linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1536 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
64a74c2ba4
commit
1a8cbd7b95
5 changed files with 64 additions and 92 deletions
|
@ -19,10 +19,13 @@
|
|||
#include "StringUtil.h" // for StringFromFormat
|
||||
#include "../Debugger/Debugger.h"
|
||||
#include "../Logging/Console.h" // for aprintf
|
||||
|
||||
#include <sstream>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "../PCHW/DSoundStream.h"
|
||||
#else
|
||||
#include "../PCHW/AOSoundStream.h"
|
||||
#endif
|
||||
#include "../PCHW/Mixer.h"
|
||||
#include "../MailHandler.h"
|
||||
|
|
|
@ -22,7 +22,10 @@
|
|||
|
||||
#ifdef _WIN32
|
||||
#include "../PCHW/DSoundStream.h"
|
||||
#else
|
||||
#include "../PCHW/AOSoundStream.h"
|
||||
#endif
|
||||
|
||||
#include "../PCHW/Mixer.h"
|
||||
#include "../MailHandler.h"
|
||||
|
||||
|
|
|
@ -22,6 +22,11 @@
|
|||
#include "UCode_AX.h"
|
||||
#include "../main.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "../PCHW/DSoundStream.h"
|
||||
#else
|
||||
#include "../PCHW/AOSoundStream.h"
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------
|
||||
// Externals
|
||||
|
@ -108,7 +113,7 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
|
|||
#ifdef _WIN32
|
||||
ratioFactor = 32000.0f / (float)DSound::DSound_GetSampleRate();
|
||||
#else
|
||||
ratioFactor = 32000.0f / 44100.0f;
|
||||
ratioFactor = 32000.0f / (float)AOSound::AOSound_GetSampleRate();
|
||||
#endif
|
||||
|
||||
DoVoiceHacks(pb, Wii);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue