diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-09-06 09:05:16 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-09-06 09:05:16 +0000 |
| commit | 74144a9957c7e78c91dfd309c263263cf958ed83 (patch) | |
| tree | b0aed5b9489a4c383deb3fcb99c4cac1e69218cc | |
| parent | 704ab8f7cc436c00c151e5608429737acb2e69ac (diff) | |
| download | pcsxr-74144a9957c7e78c91dfd309c263263cf958ed83.tar.gz | |
small fix (windows);
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87093 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | libpcsxcore/cdriso.c | 3 | ||||
| -rwxr-xr-x | libpcsxcore/cdrom.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index dd455cd1..6548e787 100755 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -707,11 +707,12 @@ static int parsecue(const char *isofile) { // Check if extension is mp3, etc, and send to decoder if not lazy decoding if ((ti[numtracks + 1].cddatype = get_cdda_type(filepath)) > BIN) { int seconds = get_compressed_cdda_track_length(filepath) + 0; + const boolean lazy_decode = TRUE; // TODO: config param + ti[numtracks + 1].len_decoded_buffer = 44100 * (16/8) * 2 * seconds; strcpy(ti[numtracks + 1].filepath, filepath); file_len = ti[numtracks + 1].len_decoded_buffer/2352; - const boolean lazy_decode = TRUE; // TODO: config param if (!lazy_decode) { // accurate length do_decode_cdda(&(ti[numtracks + 1]), numtracks + 1); fseek(ti[numtracks + 1].handle, 0, SEEK_END); diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 9635f097..2cac3a75 100755 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -107,7 +107,7 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 }; #define STATUS_ERROR (1<<0) // 0x01 /* Errors */ -#define ERROR_NOT_READY (1<<7) // 0x80 +#define ERROR_NOTREADY (1<<7) // 0x80 #define ERROR_INVALIDCMD (1<<6) // 0x40 #define ERROR_INVALIDARG (1<<5) // 0x20 @@ -1069,7 +1069,7 @@ void cdrInterrupt() { case DRIVESTATE_PREPARE_CD: SetResultSize(2); cdr.Result[0] = cdr.StatP | STATUS_ERROR; - cdr.Result[1] = ERROR_NOT_READY; + cdr.Result[1] = ERROR_NOTREADY; cdr.Stat = DiskError; break; } |
