claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some CD-ROM commands not stopping audio play when they should have (fixes data playing as audio, producing nasty artifacts, in some games), and increased the media history for all drive types from 4 to 10, also refactored cdrom_read_sector() and moved the last module-wide variables into the cdrom_t struct.

Browse Source
This commit is contained in:
OBattler
2025-01-30 08:15:39 +01:00
parent 8a1862c4b2
commit e11b5535e1
9 changed files with 262 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/scsi/scsi_cdrom.c
View File

@@ -1108,6 +1108,9 @@ scsi_cdrom_read_blocks(scsi_cdrom_t *dev, int32_t *len, const int vendor_type)
int type = dev->sector_type;
int flags = dev->sector_flags;
/* Any of these commands stop the audio playing. */
cdrom_stop(dev->drv);
switch (dev->current_cdb[0]) {
case GPCMD_READ_CD_MSF_OLD:
case GPCMD_READ_CD_MSF:
@@ -1508,6 +1511,9 @@ scsi_cdrom_stop(const scsi_common_t *sc)
static void
scsi_cdrom_set_speed(scsi_cdrom_t *dev, const uint8_t *cdb)
{
/* Stop the audio playing. */
cdrom_stop(dev->drv);
dev->drv->cur_speed = (cdb[3] | (cdb[2] << 8)) / 176;
if (dev->drv->cur_speed < 1)
dev->drv->cur_speed = 1;
@@ -3345,6 +3351,9 @@ atapi_out:
dev->drv->seek_diff = ABS((int) (pos - dev->drv->seek_pos));
/* Stop the audio playing. */
cdrom_stop(dev->drv);
if (dev->use_cdb_9 && (cdb[0] == GPCMD_SEEK_10))
cdrom_seek(dev->drv, pos, cdb[9] & 0xc0);
else