notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #21 from phaseIV/master
[pcsx_rearmed.git]
/
libpcsxcore
/
cdriso.c
diff --git
a/libpcsxcore/cdriso.c
b/libpcsxcore/cdriso.c
index
b733f5b
..
46ee020
100644
(file)
--- a/
libpcsxcore/cdriso.c
+++ b/
libpcsxcore/cdriso.c
@@
-26,9
+26,11
@@
#include "ppf.h"
#ifdef _WIN32
#include "ppf.h"
#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
#include <process.h>
#include <windows.h>
#define strcasecmp _stricmp
#include <process.h>
#include <windows.h>
#define strcasecmp _stricmp
+#define usleep(x) (Sleep((x) / 1000))
#else
#include <pthread.h>
#include <sys/time.h>
#else
#include <pthread.h>
#include <sys/time.h>
@@
-221,7
+223,9
@@
static void *playthread(void *param)
do {
ret = SPU_playCDDAchannel((short *)sndbuffer, s);
if (ret == 0x7761)
do {
ret = SPU_playCDDAchannel((short *)sndbuffer, s);
if (ret == 0x7761)
+ {
usleep(6 * 1000);
usleep(6 * 1000);
+ }
} while (ret == 0x7761 && playing); // rearmed_wait
}
} while (ret == 0x7761 && playing); // rearmed_wait
}
@@
-232,7
+236,9
@@
static void *playthread(void *param)
// HACK: stop feeding data while emu is paused
extern int stop;
while (stop && playing)
// HACK: stop feeding data while emu is paused
extern int stop;
while (stop && playing)
+ {
usleep(10000);
usleep(10000);
+ }
now = GetTickCount();
osleep = t - now;
now = GetTickCount();
osleep = t - now;