mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 13:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-plumb window handle to the dsound backend.

Browse source 
Reverts parts of commit 71c01d83ab614b9e0c421d03ca694713dbabff48.
Fixes issue 6800
This commit is contained in:
Shawn Hoffman 2013-11-07 09:24:56 -08:00
commit 33d56f50a4
9 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/AudioCommon.cpp
View file

@ -23,7 +23,7 @@ SoundStream *soundStream = nullptr;
namespace AudioCommon
{
SoundStream *InitSoundStream(CMixer *mixer)
SoundStream *InitSoundStream(CMixer *mixer, void *hWnd)
{
// TODO: possible memleak with mixer
@ -33,7 +33,7 @@ namespace AudioCommon
else if (backend == BACKEND_NULLSOUND && NullSound::isValid())
soundStream = new NullSound(mixer);
else if (backend == BACKEND_DIRECTSOUND && DSound::isValid())
soundStream = new DSound(mixer);
soundStream = new DSound(mixer, hWnd);
else if (backend == BACKEND_XAUDIO2)
{
if (XAudio2::isValid())

2
Source/Core/AudioCommon/Src/AudioCommon.h
View file

@ -40,7 +40,7 @@ union UDSPControl
namespace AudioCommon
{
SoundStream *InitSoundStream(CMixer *mixer);
SoundStream *InitSoundStream(CMixer *mixer, void *hWnd);
void ShutdownSoundStream();
std::vector<std::string> GetSoundBackends();
bool UseJIT();

4
Source/Core/AudioCommon/Src/DSoundStream.h
View file

@ -48,7 +48,7 @@ class DSound : public SoundStream
bool WriteDataToBuffer(DWORD dwOffset, char* soundData, DWORD dwSoundBytes);
public:
DSound(CMixer *mixer, void *_hWnd = NULL)
DSound(CMixer *mixer, void *_hWnd)
: SoundStream(mixer)
, bufferSize(0)
, currentPos(0)
@ -71,7 +71,7 @@ public:
#else
public:
DSound(CMixer *mixer)
DSound(CMixer *mixer, void *_hWnd)
: SoundStream(mixer)
{}
#endif