diff --git a/libretro-common/audio/resampler/audio_resampler.c b/libretro-common/audio/resampler/audio_resampler.c index 6a26bda5c9..9c84f38bd6 100644 --- a/libretro-common/audio/resampler/audio_resampler.c +++ b/libretro-common/audio/resampler/audio_resampler.c @@ -80,36 +80,6 @@ static int find_resampler_driver_index(const char *ident) return -1; } -/** - * audio_resampler_driver_find_handle: - * @idx : index of driver to get handle to. - * - * Returns: handle to audio resampler driver at index. Can be NULL - * if nothing found. - **/ -const void *audio_resampler_driver_find_handle(int idx) -{ - const void *drv = resampler_drivers[idx]; - if (!drv) - return NULL; - return drv; -} - -/** - * audio_resampler_driver_find_ident: - * @idx : index of driver to get handle to. - * - * Returns: Human-readable identifier of audio resampler driver at index. - * Can be NULL if nothing found. - **/ -const char *audio_resampler_driver_find_ident(int idx) -{ - const retro_resampler_t *drv = resampler_drivers[idx]; - if (!drv) - return NULL; - return drv->ident; -} - /** * find_resampler_driver: * @ident : Identifier of resampler driver to find. @@ -154,6 +124,37 @@ static bool resampler_append_plugs(void **re, return true; } + +/** + * audio_resampler_driver_find_handle: + * @idx : index of driver to get handle to. + * + * Returns: handle to audio resampler driver at index. Can be NULL + * if nothing found. + **/ +const void *audio_resampler_driver_find_handle(int idx) +{ + const void *drv = resampler_drivers[idx]; + if (!drv) + return NULL; + return drv; +} + +/** + * audio_resampler_driver_find_ident: + * @idx : index of driver to get handle to. + * + * Returns: Human-readable identifier of audio resampler driver at index. + * Can be NULL if nothing found. + **/ +const char *audio_resampler_driver_find_ident(int idx) +{ + const retro_resampler_t *drv = resampler_drivers[idx]; + if (!drv) + return NULL; + return drv->ident; +} + /** * retro_resampler_realloc: * @re : Resampler handle diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c index 32b99c1c01..4afb009e87 100644 --- a/libretro-common/vfs/vfs_implementation.c +++ b/libretro-common/vfs/vfs_implementation.c @@ -179,7 +179,9 @@ #define RFILE_HINT_UNBUFFERED (1 << 8) -int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, int64_t offset, int whence) +int64_t retro_vfs_file_seek_internal( + libretro_vfs_implementation_file *stream, + int64_t offset, int whence) { if (!stream) return -1; @@ -508,9 +510,7 @@ int retro_vfs_file_close_impl(libretro_vfs_implementation_file *stream) if ((stream->hints & RFILE_HINT_UNBUFFERED) == 0) { if (stream->fp) - { fclose(stream->fp); - } } else { diff --git a/libretro-common/vfs/vfs_implementation_cdrom.c b/libretro-common/vfs/vfs_implementation_cdrom.c index 54d3721cef..093cd9cc02 100644 --- a/libretro-common/vfs/vfs_implementation_cdrom.c +++ b/libretro-common/vfs/vfs_implementation_cdrom.c @@ -30,6 +30,7 @@ #include #endif +/* TODO/FIXME - static global variable */ static cdrom_toc_t vfs_cdrom_toc = {0}; const cdrom_toc_t* retro_vfs_file_get_cdrom_toc(void) @@ -37,7 +38,9 @@ const cdrom_toc_t* retro_vfs_file_get_cdrom_toc(void) return &vfs_cdrom_toc; } -int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int64_t offset, int whence) +int64_t retro_vfs_file_seek_cdrom( + libretro_vfs_implementation_file *stream, + int64_t offset, int whence) { const char *ext = path_get_extension(stream->orig_path); @@ -52,68 +55,84 @@ int64_t retro_vfs_file_seek_cdrom(libretro_vfs_implementation_file *stream, int6 stream->cdrom.byte_pos += offset; break; case SEEK_END: - stream->cdrom.byte_pos = (stream->cdrom.cue_len - 1) + offset; + stream->cdrom.byte_pos = (stream->cdrom.cue_len - 1) + offset; break; } #ifdef CDROM_DEBUG - printf("[CDROM] Seek: Path %s Offset %" PRIu64 " is now at %" PRIu64 "\n", stream->orig_path, offset, stream->cdrom.byte_pos); + printf("[CDROM] Seek: Path %s Offset %" PRIu64 " is now at %" PRIu64 "\n", + stream->orig_path, + offset, + stream->cdrom.byte_pos); fflush(stdout); #endif } else if (string_is_equal_noncase(ext, "bin")) { - int lba = (offset / 2352); - unsigned char min = 0; - unsigned char sec = 0; - unsigned char frame = 0; + int lba = (offset / 2352); + unsigned char min = 0; + unsigned char sec = 0; + unsigned char frame = 0; +#ifdef CDROM_DEBUG const char *seek_type = "SEEK_SET"; - - (void)seek_type; +#endif switch (whence) { case SEEK_CUR: - { - unsigned new_lba; - - stream->cdrom.byte_pos += offset; - new_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352); - seek_type = "SEEK_CUR"; - - cdrom_lba_to_msf(new_lba, &min, &sec, &frame); + { + unsigned new_lba; +#ifdef CDROM_DEBUG + seek_type = "SEEK_CUR"; +#endif + stream->cdrom.byte_pos += offset; + new_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352); + cdrom_lba_to_msf(new_lba, &min, &sec, &frame); + } break; - } case SEEK_END: - { - ssize_t pregap_lba_len = (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].audio ? 0 : (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba_start)); - ssize_t lba_len = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_size - pregap_lba_len; - - cdrom_lba_to_msf(lba_len + lba, &min, &sec, &frame); - - stream->cdrom.byte_pos = lba_len * 2352; - seek_type = "SEEK_END"; + { + ssize_t pregap_lba_len = (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].audio + ? 0 + : (vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba_start)); + ssize_t lba_len = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_size - pregap_lba_len; +#ifdef CDROM_DEBUG + seek_type = "SEEK_END"; +#endif + cdrom_lba_to_msf(lba_len + lba, &min, &sec, &frame); + stream->cdrom.byte_pos = lba_len * 2352; + } break; - } case SEEK_SET: default: - { - seek_type = "SEEK_SET"; - stream->cdrom.byte_pos = offset; - cdrom_lba_to_msf(vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352), &min, &sec, &frame); + { +#ifdef CDROM_DEBUG + seek_type = "SEEK_SET"; +#endif + stream->cdrom.byte_pos = offset; + cdrom_lba_to_msf(vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352), &min, &sec, &frame); + } break; - } } - stream->cdrom.cur_min = min; - stream->cdrom.cur_sec = sec; + stream->cdrom.cur_min = min; + stream->cdrom.cur_sec = sec; stream->cdrom.cur_frame = frame; - stream->cdrom.cur_lba = cdrom_msf_to_lba(min, sec, frame); + stream->cdrom.cur_lba = cdrom_msf_to_lba(min, sec, frame); #ifdef CDROM_DEBUG - printf("[CDROM] Seek %s: Path %s Offset %" PRIu64 " is now at %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)...\n", seek_type, stream->orig_path, offset, stream->cdrom.byte_pos, (unsigned)stream->cdrom.cur_min, (unsigned)stream->cdrom.cur_sec, (unsigned)stream->cdrom.cur_frame, stream->cdrom.cur_lba); + printf( + "[CDROM] Seek %s: Path %s Offset %" PRIu64 " is now at %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)...\n", + seek_type, + stream->orig_path, + offset, + stream->cdrom.byte_pos, + (unsigned)stream->cdrom.cur_min, + (unsigned)stream->cdrom.cur_sec, + (unsigned)stream->cdrom.cur_frame, + stream->cdrom.cur_lba); fflush(stdout); #endif } @@ -128,13 +147,14 @@ void retro_vfs_file_open_cdrom( const char *path, unsigned mode, unsigned hints) { #if defined(__linux__) && !defined(ANDROID) - char cdrom_path[] = "/dev/sg1"; - size_t path_len = strlen(path); - const char *ext = path_get_extension(path); + char cdrom_path[] = "/dev/sg1"; + size_t path_len = strlen(path); + const char *ext = path_get_extension(path); stream->cdrom.cur_track = 1; - if (!string_is_equal_noncase(ext, "cue") && !string_is_equal_noncase(ext, "bin")) + if ( !string_is_equal_noncase(ext, "cue") + && !string_is_equal_noncase(ext, "bin")) return; if (path_len >= STRLEN_CONST("drive1-track01.bin")) @@ -160,7 +180,7 @@ void retro_vfs_file_open_cdrom( { if (path[5] >= '0' && path[5] <= '9') { - cdrom_path[7] = path[5]; + cdrom_path[7] = path[5]; stream->cdrom.drive = path[5]; vfs_cdrom_toc.drive = stream->cdrom.drive; } @@ -184,7 +204,12 @@ void retro_vfs_file_open_cdrom( stream->cdrom.cue_buf = NULL; } - cdrom_write_cue(stream, &stream->cdrom.cue_buf, &stream->cdrom.cue_len, stream->cdrom.drive, &vfs_cdrom_toc.num_tracks, &vfs_cdrom_toc); + cdrom_write_cue(stream, + &stream->cdrom.cue_buf, + &stream->cdrom.cue_len, + stream->cdrom.drive, + &vfs_cdrom_toc.num_tracks, + &vfs_cdrom_toc); cdrom_get_timeouts(stream, &vfs_cdrom_toc.timeouts); #ifdef CDROM_DEBUG @@ -203,10 +228,11 @@ void retro_vfs_file_open_cdrom( #endif #if defined(_WIN32) && !defined(_XBOX) char cdrom_path[] = "\\\\.\\D:"; - size_t path_len = strlen(path); - const char *ext = path_get_extension(path); + size_t path_len = strlen(path); + const char *ext = path_get_extension(path); - if (!string_is_equal_noncase(ext, "cue") && !string_is_equal_noncase(ext, "bin")) + if ( !string_is_equal_noncase(ext, "cue") + && !string_is_equal_noncase(ext, "bin")) return; if (path_len >= STRLEN_CONST("d:/drive-track01.bin")) @@ -229,7 +255,7 @@ void retro_vfs_file_open_cdrom( { if ((path[0] >= 'A' && path[0] <= 'Z') || (path[0] >= 'a' && path[0] <= 'z')) { - cdrom_path[4] = path[0]; + cdrom_path[4] = path[0]; stream->cdrom.drive = path[0]; vfs_cdrom_toc.drive = stream->cdrom.drive; } @@ -240,7 +266,13 @@ void retro_vfs_file_open_cdrom( printf("[CDROM] Open: Path %s URI %s\n", cdrom_path, path); fflush(stdout); #endif - stream->fh = CreateFile(cdrom_path, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + stream->fh = CreateFile(cdrom_path, + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, + NULL); if (stream->fh == INVALID_HANDLE_VALUE) return; @@ -253,8 +285,14 @@ void retro_vfs_file_open_cdrom( stream->cdrom.cue_buf = NULL; } - cdrom_write_cue(stream, &stream->cdrom.cue_buf, &stream->cdrom.cue_len, stream->cdrom.drive, &vfs_cdrom_toc.num_tracks, &vfs_cdrom_toc); - cdrom_get_timeouts(stream, &vfs_cdrom_toc.timeouts); + cdrom_write_cue(stream, + &stream->cdrom.cue_buf, + &stream->cdrom.cue_len, + stream->cdrom.drive, + &vfs_cdrom_toc.num_tracks, + &vfs_cdrom_toc); + cdrom_get_timeouts(stream, + &vfs_cdrom_toc.timeouts); #ifdef CDROM_DEBUG if (string_is_empty(stream->cdrom.cue_buf)) @@ -272,17 +310,17 @@ void retro_vfs_file_open_cdrom( #endif if (vfs_cdrom_toc.num_tracks > 1 && stream->cdrom.cur_track) { - stream->cdrom.cur_min = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].min; - stream->cdrom.cur_sec = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].sec; + stream->cdrom.cur_min = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].min; + stream->cdrom.cur_sec = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].sec; stream->cdrom.cur_frame = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].frame; - stream->cdrom.cur_lba = cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame); + stream->cdrom.cur_lba = cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame); } else { - stream->cdrom.cur_min = vfs_cdrom_toc.track[0].min; - stream->cdrom.cur_sec = vfs_cdrom_toc.track[0].sec; + stream->cdrom.cur_min = vfs_cdrom_toc.track[0].min; + stream->cdrom.cur_sec = vfs_cdrom_toc.track[0].sec; stream->cdrom.cur_frame = vfs_cdrom_toc.track[0].frame; - stream->cdrom.cur_lba = cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame); + stream->cdrom.cur_lba = cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame); } } @@ -340,9 +378,14 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream, if (string_is_equal_noncase(ext, "cue")) { - if ((int64_t)len >= (int64_t)stream->cdrom.cue_len - stream->cdrom.byte_pos) len = stream->cdrom.cue_len - stream->cdrom.byte_pos - 1; + if ((int64_t)len >= (int64_t)stream->cdrom.cue_len + - stream->cdrom.byte_pos) + len = stream->cdrom.cue_len - stream->cdrom.byte_pos - 1; #ifdef CDROM_DEBUG - printf("[CDROM] Read: Reading %" PRIu64 " bytes from cuesheet starting at %" PRIu64 "...\n", len, stream->cdrom.byte_pos); + printf( + "[CDROM] Read: Reading %" PRIu64 " bytes from cuesheet starting at %" PRIu64 "...\n", + len, + stream->cdrom.byte_pos); fflush(stdout); #endif memcpy(s, stream->cdrom.cue_buf + stream->cdrom.byte_pos, len); @@ -352,30 +395,52 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream, } else if (string_is_equal_noncase(ext, "bin")) { - size_t skip = stream->cdrom.byte_pos % 2352; - unsigned char min = 0; - unsigned char sec = 0; - unsigned char frame = 0; - unsigned char rmin = 0; - unsigned char rsec = 0; + unsigned char min = 0; + unsigned char sec = 0; + unsigned char frame = 0; + unsigned char rmin = 0; + unsigned char rsec = 0; unsigned char rframe = 0; + size_t skip = stream->cdrom.byte_pos % 2352; - if (stream->cdrom.byte_pos >= vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes) + if (stream->cdrom.byte_pos >= + vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes) return 0; - if (stream->cdrom.byte_pos + len > vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes) - len -= (stream->cdrom.byte_pos + len) - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes; + if (stream->cdrom.byte_pos + len > + vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes) + len -= (stream->cdrom.byte_pos + len) + - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].track_bytes; cdrom_lba_to_msf(stream->cdrom.cur_lba, &min, &sec, &frame); - cdrom_lba_to_msf(stream->cdrom.cur_lba - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba, &rmin, &rsec, &rframe); + cdrom_lba_to_msf(stream->cdrom.cur_lba + - vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba, + &rmin, &rsec, &rframe); #ifdef CDROM_DEBUG - printf("[CDROM] Read: Reading %" PRIu64 " bytes from %s starting at byte offset %" PRIu64 " (rMSF %02u:%02u:%02u aMSF %02u:%02u:%02u) (LBA %u) skip %" PRIu64 "...\n", len, stream->orig_path, stream->cdrom.byte_pos, (unsigned)rmin, (unsigned)rsec, (unsigned)rframe, (unsigned)min, (unsigned)sec, (unsigned)frame, stream->cdrom.cur_lba, skip); + printf( + "[CDROM] Read: Reading %" PRIu64 " bytes from %s starting at byte offset %" PRIu64 " (rMSF %02u:%02u:%02u aMSF %02u:%02u:%02u) (LBA %u) skip %" PRIu64 "...\n", + len, + stream->orig_path, + stream->cdrom.byte_pos, + (unsigned)rmin, + (unsigned)rsec, + (unsigned)rframe, + (unsigned)min, + (unsigned)sec, + (unsigned)frame, + stream->cdrom.cur_lba, + skip); fflush(stdout); #endif - rv = cdrom_read(stream, &vfs_cdrom_toc.timeouts, min, sec, frame, s, (size_t)len, skip); - /*rv = cdrom_read_lba(stream, stream->cdrom.cur_lba, s, (size_t)len, skip);*/ +#if 1 + rv = cdrom_read(stream, &vfs_cdrom_toc.timeouts, min, sec, + frame, s, (size_t)len, skip); +#else + rv = cdrom_read_lba(stream, stream->cdrom.cur_lba, s, + (size_t)len, skip); +#endif if (rv) { @@ -387,12 +452,28 @@ int64_t retro_vfs_file_read_cdrom(libretro_vfs_implementation_file *stream, } stream->cdrom.byte_pos += len; - stream->cdrom.cur_lba = vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + (stream->cdrom.byte_pos / 2352); + stream->cdrom.cur_lba = + vfs_cdrom_toc.track[stream->cdrom.cur_track - 1].lba + + (stream->cdrom.byte_pos / 2352); - cdrom_lba_to_msf(stream->cdrom.cur_lba, &stream->cdrom.cur_min, &stream->cdrom.cur_sec, &stream->cdrom.cur_frame); + cdrom_lba_to_msf(stream->cdrom.cur_lba, + &stream->cdrom.cur_min, + &stream->cdrom.cur_sec, + &stream->cdrom.cur_frame); #ifdef CDROM_DEBUG - printf("[CDROM] read %" PRIu64 " bytes, position is now: %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)\n", len, stream->cdrom.byte_pos, (unsigned)stream->cdrom.cur_min, (unsigned)stream->cdrom.cur_sec, (unsigned)stream->cdrom.cur_frame, cdrom_msf_to_lba(stream->cdrom.cur_min, stream->cdrom.cur_sec, stream->cdrom.cur_frame)); + printf( + "[CDROM] read %" PRIu64 " bytes, position is now: %" PRIu64 " (MSF %02u:%02u:%02u) (LBA %u)\n", + len, + stream->cdrom.byte_pos, + (unsigned)stream->cdrom.cur_min, + (unsigned)stream->cdrom.cur_sec, + (unsigned)stream->cdrom.cur_frame, + cdrom_msf_to_lba( + stream->cdrom.cur_min, + stream->cdrom.cur_sec, + stream->cdrom.cur_frame) + ); fflush(stdout); #endif @@ -407,7 +488,8 @@ int retro_vfs_file_error_cdrom(libretro_vfs_implementation_file *stream) return 0; } -const vfs_cdrom_t* retro_vfs_file_get_cdrom_position(const libretro_vfs_implementation_file *stream) +const vfs_cdrom_t* retro_vfs_file_get_cdrom_position( + const libretro_vfs_implementation_file *stream) { return &stream->cdrom; }