claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various upstream changes applied.

Browse Source
This commit is contained in:
waltje
2018-09-04 01:41:27 -04:00
parent 5e606c8e7a
commit dad6c07865
10 changed files with 256 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/win/win_settings_disk.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_disk.h 1.0.12 2018/05/27
* Version: @(#)win_settings_disk.h 1.0.13 2018/09/03
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -1744,7 +1744,7 @@ hd_bus_skip:
return FALSE;
case IDC_BUTTON_HDD_REMOVE:
memcpy(temp_hdd[hdlv_current_sel].fn, L"", 4);
wcscpy(temp_hdd[hdlv_current_sel].fn, L"");
disk_untrack(hdlv_current_sel);
temp_hdd[hdlv_current_sel].bus = HDD_BUS_DISABLED; /* Only set the bus to zero, the list normalize code below will take care of turning this entire entry to a complete zero. */
disk_normalize_list(); /* Normalize the hard disks so that non-disabled hard disks start from index 0, and so they are contiguous. */

22
src/win/win_settings_sound.h
View File

@@ -8,7 +8,7 @@
*
* Implementation of the Settings dialog.
*
* Version: @(#)win_settings_sound.h 1.0.9 2018/05/21
* Version: @(#)win_settings_sound.h 1.0.10 2018/09/03
*
* Authors: Fred N. van Kempen, <decwiz@yahoo.com>
* Miran Grca, <mgrca8@gmail.com>
@@ -57,8 +57,9 @@ mpu401_present(void)
stransi = sound_card_get_internal_name(temp_sound_card);
if (stransi != NULL) {
if (!strcmp(stransi, "sb16") || !strcmp(stransi, "sbawe32"))
return 1;
if (!strcmp(stransi, "sb16") ||
!strcmp(stransi, "sbawe32") ||
!strcmp(stransi, "replysb16")) return 1;
}
return temp_mpu401 ? 1 : 0;
@@ -73,8 +74,9 @@ mpu401_standalone_allow(void)
n = sound_card_get_internal_name(temp_sound_card);
md = midi_device_get_internal_name(temp_midi_device);
if (n != NULL) {
if (!strcmp(n, "sb16") || !strcmp(n, "sbawe32"))
return 0;
if (!strcmp(n, "sb16") ||
!strcmp(n, "sbawe32") ||
!strcmp(n, "replysb16")) return 0;
}
if (md != NULL) {
@@ -235,7 +237,15 @@ sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
break;
case IDC_CONFIGURE_MPU401:
temp_deviceconfig |= dlg_devconf(hdlg, (void *)&mpu401_device);
stransi = sound_card_get_internal_name(temp_sound_card);
if (stransi != NULL) {
if (! strcmp(stransi, "ncraudio"))
mca_version = 1;
else
mca_version = 0;
}
temp_deviceconfig |= dlg_devconf(hdlg, mca_version ? (void *)&mpu401_mca_device : (void *)&mpu401_device);
break;
}
return FALSE;