summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorSonicadvance1 <sonicadvance1@gmail.com>2008-08-23 11:18:39 +0000
committerSonicadvance1 <sonicadvance1@gmail.com>2008-08-23 11:18:39 +0000
commitd697eb6a8558ddbf3a45e1297a5edc1a5d23a37a (patch)
tree9f87f2f3cf9886c13cb80ecd2e0f50dfee865270 /Source
parentf82bf2ae9abbf2cfeef5ad88a1a8d55ff0171afa (diff)
Fix Compiling for people, Silly ector breaking things ;p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@280 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp1
-rw-r--r--Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp10
2 files changed, 7 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index 2cc91d8d4a..10cf0c5b1d 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -22,6 +22,7 @@
#include "ABI.h"
#include "Thunk.h"
#include "../../HLE/HLE.h"
+#include "../../Core.h"
#include "../../CoreTiming.h"
#include "../PowerPC.h"
#include "../PPCTables.h"
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
index cee0c2048e..9ecc07fba8 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
@@ -83,18 +83,20 @@ void Mixer_PushSamples(short *buffer, int num_stereo_samples, int sample_rate) {
static int PV1r=0,PV2r=0,PV3r=0,PV4r=0;
static int acc=0;
+#ifdef _WIN32
if (!GetAsyncKeyState(VK_TAB)) {
while (queue_size > queue_maxlength / 2) {
-#ifdef _WIN32
DSound::DSound_UpdateSound();
Sleep(0);
-#else
- sleep(0);
-#endif
}
} else {
return;
}
+#else
+ while (queue_size > queue_maxlength / 2) {
+ sleep(0);
+ }
+#endif
//convert into config option?
const int mode = 2;