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

Split off the Network configuration from Other peripherals in the Settings dialog and made PCap device configurable;

Browse Source 
Overhauled the configuration files so that the global variables are now subdivided into sections;
Fixed CD-ROM MODE SENSE page 0x2A which was being incorrectly reported as not implemented, fixes among other things Rayman 1 and Spellcross: The Last Battle (both now see the CD-ROM and play CD Audio fine).
This commit is contained in:
OBattler
2017-05-17 21:56:31 +02:00
parent 34c08faf46
commit 1a9a55c35e
25 changed files with 1523 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/SOUND/snd_sb.c
View File

@@ -780,9 +780,6 @@ static device_config_t sb_config[] =
}
}
},
{
"midi", "MIDI out device", CONFIG_MIDI, "", 0
},
{
"", "", -1
}
@@ -821,9 +818,6 @@ static device_config_t sb_mcv_config[] =
}
}
},
{
"midi", "MIDI out device", CONFIG_MIDI, "", 0
},
{
"", "", -1
}
@@ -879,9 +873,6 @@ static device_config_t sb_pro_config[] =
}
}
},
{
"midi", "MIDI out device", CONFIG_MIDI, "", 0
},
{
"", "", -1
}
@@ -1003,9 +994,6 @@ static device_config_t sb_16_config[] =
}
}
},
{
"midi", "MIDI out device", CONFIG_MIDI, "", 0
},
{
"mode401", "MPU-401 mode", CONFIG_SELECTION, "", 1,
{
@@ -1141,9 +1129,6 @@ static device_config_t sb_awe32_config[] =
}
}
},
{
"midi", "MIDI out device", CONFIG_MIDI, "", 0
},
{
"mode401", "MPU-401 mode", CONFIG_SELECTION, "", 1,
{

8
src/SOUND/sound.c
View File

@@ -146,7 +146,7 @@ static void sound_cd_thread(void *param)
has_audio = 0;
for (i = 0; i < CDROM_NUM; i++)
{
if (cdrom_drives[i].enabled && cdrom_drives[i].sound_on)
if (cdrom_drives[i].bus_type && cdrom_drives[i].sound_on)
{
has_audio++;
}
@@ -161,7 +161,7 @@ static void sound_cd_thread(void *param)
if (cdrom_drives[i].handler->audio_callback)
{
cdrom_drives[i].handler->audio_callback(i, cd_buffer[i], CD_BUFLEN*2);
has_audio = (cdrom_drives[i].enabled && cdrom_drives[i].sound_on);
has_audio = (cdrom_drives[i].bus_type && cdrom_drives[i].sound_on);
}
if (soundon && has_audio)
{
@@ -240,7 +240,7 @@ void sound_init()
for (i = 0; i < CDROM_NUM; i++)
{
if (cdrom_drives[i].enabled && cdrom_drives[i].sound_on)
if (cdrom_drives[i].bus_type && cdrom_drives[i].sound_on)
{
available_cdrom_drives++;
}
@@ -329,7 +329,7 @@ void sound_cd_thread_reset()
for (i = 0; i < CDROM_NUM; i++)
{
if (cdrom_drives[i].enabled && cdrom_drives[i].sound_on)
if (cdrom_drives[i].bus_type && cdrom_drives[i].sound_on)
{
available_cdrom_drives++;
}