notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5c166f3
)
Attempt to avod build errors for Mingw
author
twinaphex
<libretro@gmail.com>
Sun, 1 Nov 2015 09:25:51 +0000
(10:25 +0100)
committer
twinaphex
<libretro@gmail.com>
Sun, 1 Nov 2015 09:25:51 +0000
(10:25 +0100)
libpcsxcore/cdriso.c
patch
|
blob
|
blame
|
history
diff --git
a/libpcsxcore/cdriso.c
b/libpcsxcore/cdriso.c
index
09aed17
..
46ee020
100644
(file)
--- a/
libpcsxcore/cdriso.c
+++ b/
libpcsxcore/cdriso.c
@@
-30,7
+30,7
@@
#include <process.h>
#include <windows.h>
#define strcasecmp _stricmp
#include <process.h>
#include <windows.h>
#define strcasecmp _stricmp
-#define usleep(x)
Sleep((x) / 1000
)
+#define usleep(x)
(Sleep((x) / 1000)
)
#else
#include <pthread.h>
#include <sys/time.h>
#else
#include <pthread.h>
#include <sys/time.h>
@@
-223,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
}
@@
-234,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;