mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-24 15:02:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdrom: fix warnings, use dot for frame notation in disc info

Browse Source
This commit is contained in:
Brad Parker 2019-07-15 17:16:19 -04:00
parent 0a674a9a04
commit cc3b44f7ba
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libretro-common/cdrom/cdrom.c
View File

@ -838,7 +838,6 @@ static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsig
/* MMC Command: READ TRACK INFORMATION */ /* MMC Command: READ TRACK INFORMATION */
unsigned char cdb[] = {0x52, 0x1, 0, 0, 0, 0, 0, 0x1, 0x80, 0}; unsigned char cdb[] = {0x52, 0x1, 0, 0, 0, 0, 0, 0x1, 0x80, 0};
unsigned char buf[384] = {0}; unsigned char buf[384] = {0};
unsigned char mode = 0;
unsigned lba = 0; unsigned lba = 0;
unsigned track_size = 0; unsigned track_size = 0;
int rv; int rv;
@ -869,7 +868,7 @@ static int cdrom_read_track_info(libretro_vfs_implementation_file *stream, unsig
#ifdef CDROM_DEBUG #ifdef CDROM_DEBUG
printf("[CDROM] Track %d Info: ", track); printf("[CDROM] Track %d Info: ", track);
printf("[CDROM] Copy: %d ", (buf[5] & 0x10) > 0); printf("[CDROM] Copy: %d ", (buf[5] & 0x10) > 0);
printf("[CDROM] Data Mode: %d ", mode); printf("[CDROM] Data Mode: %d ", toc->track[track - 1].mode);
printf("[CDROM] LBA Start: %d (%d) ", lba, toc->track[track - 1].lba); printf("[CDROM] LBA Start: %d (%d) ", lba, toc->track[track - 1].lba);
printf("[CDROM] Track Size: %d\n", track_size); printf("[CDROM] Track Size: %d\n", track_size);
fflush(stdout); fflush(stdout);
@ -1482,7 +1481,7 @@ bool cdrom_set_read_cache(const libretro_vfs_implementation_file *stream, bool e
bool cdrom_get_timeouts(libretro_vfs_implementation_file *stream, cdrom_group_timeouts_t *timeouts) bool cdrom_get_timeouts(libretro_vfs_implementation_file *stream, cdrom_group_timeouts_t *timeouts)
{ {
/* MMC Command: MODE SENSE (10) */ /* MMC Command: MODE SENSE (10) */
int rv, i; int rv;
unsigned char cdb[] = {0x5A, 0, 0x1D, 0, 0, 0, 0, 0, 0x14, 0}; unsigned char cdb[] = {0x5A, 0, 0x1D, 0, 0, 0, 0, 0, 0x14, 0};
unsigned char buf[20] = {0}; unsigned char buf[20] = {0};
unsigned short g1 = 0; unsigned short g1 = 0;
@ -1507,20 +1506,24 @@ bool cdrom_get_timeouts(libretro_vfs_implementation_file *stream, cdrom_group_ti
g3 = buf[18] << 8 | buf[19]; g3 = buf[18] << 8 | buf[19];
#ifdef CDROM_DEBUG #ifdef CDROM_DEBUG
printf("Mode sense data for timeout groups: ");
for (i = 0; i < (int)sizeof(buf); i++)
{ {
printf("%02X ", buf[i]); int i;
printf("Mode sense data for timeout groups: ");
for (i = 0; i < (int)sizeof(buf); i++)
{
printf("%02X ", buf[i]);
}
printf("\n");
printf("Group 1 Timeout: %d\n", g1);
printf("Group 2 Timeout: %d\n", g2);
printf("Group 3 Timeout: %d\n", g3);
fflush(stdout);
} }
printf("\n");
printf("Group 1 Timeout: %d\n", g1);
printf("Group 2 Timeout: %d\n", g2);
printf("Group 3 Timeout: %d\n", g3);
fflush(stdout);
#endif #endif
timeouts->g1_timeout = g1; timeouts->g1_timeout = g1;

2
menu/menu_displaylist.c
View File

@ -5144,7 +5144,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
cdrom_lba_to_msf(toc->track[i].track_size, &min, &sec, &frame); cdrom_lba_to_msf(toc->track[i].track_size, &min, &sec, &frame);
snprintf(length_string + strlen(length_string), sizeof(length_string) - strlen(length_string), "%02d:%02d:%02d", min, sec, frame); snprintf(length_string + strlen(length_string), sizeof(length_string) - strlen(length_string), "%02d:%02d.%02d", min, sec, frame);
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
length_string, length_string,