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
spu: make fmod work in threaded mode
[pcsx_rearmed.git]
/
libpcsxcore
/
cdriso.c
diff --git
a/libpcsxcore/cdriso.c
b/libpcsxcore/cdriso.c
index
f47fcfd
..
081a8f2
100644
(file)
--- a/
libpcsxcore/cdriso.c
+++ b/
libpcsxcore/cdriso.c
@@
-30,8
+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)
-#else
+#elif P_HAVE_PTHREAD
#include <pthread.h>
#include <sys/time.h>
#include <unistd.h>
#include <pthread.h>
#include <sys/time.h>
#include <unistd.h>
@@
-1327,7
+1326,6
@@
static long CALLBACK ISOopen(void) {
char alt_bin_filename[MAXPATHLEN];
const char *bin_filename;
char image_str[1024];
char alt_bin_filename[MAXPATHLEN];
const char *bin_filename;
char image_str[1024];
- int is_chd = 0;
if (cdHandle != NULL) {
return 0; // it's already open
if (cdHandle != NULL) {
return 0; // it's already open
@@
-1382,7
+1380,6
@@
static long CALLBACK ISOopen(void) {
CDR_getBuffer = ISOgetBuffer_chd;
cdimg_read_func = cdread_chd;
cdimg_read_sub_func = cdread_sub_chd;
CDR_getBuffer = ISOgetBuffer_chd;
cdimg_read_func = cdread_chd;
cdimg_read_sub_func = cdread_sub_chd;
- is_chd = 1;
}
#endif
}
#endif
@@
-1423,14
+1420,11
@@
static long CALLBACK ISOopen(void) {
}
// guess whether it is mode1/2048
}
// guess whether it is mode1/2048
- if (ftello(cdHandle) % 2048 == 0) {
+ if (
cdimg_read_func == cdread_normal &&
ftello(cdHandle) % 2048 == 0) {
unsigned int modeTest = 0;
fseek(cdHandle, 0, SEEK_SET);
if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) {
unsigned int modeTest = 0;
fseek(cdHandle, 0, SEEK_SET);
if (!fread(&modeTest, sizeof(modeTest), 1, cdHandle)) {
-#ifndef NDEBUG
SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
-#endif
- return -1;
}
if (SWAP32(modeTest) != 0xffffff00) {
strcat(image_str, "[2048]");
}
if (SWAP32(modeTest) != 0xffffff00) {
strcat(image_str, "[2048]");
@@
-1443,7
+1437,7
@@
static long CALLBACK ISOopen(void) {
PrintTracks();
PrintTracks();
- if (subChanMixed &&
!is_chd
) {
+ if (subChanMixed &&
cdimg_read_func == cdread_normal
) {
cdimg_read_func = cdread_sub_mixed;
cdimg_read_sub_func = cdread_sub_sub_mixed;
}
cdimg_read_func = cdread_sub_mixed;
cdimg_read_sub_func = cdread_sub_sub_mixed;
}