80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Less confusion for midi out

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-30 22:06:18 -05:00
parent 3a8c58ca09
commit a666ff87c0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/86box/resource.h
View File

@@ -154,7 +154,7 @@
#define IDC_CHECK_SSI 1042 #define IDC_CHECK_SSI 1042
#define IDC_CHECK_CMS 1043 #define IDC_CHECK_CMS 1043
#define IDC_CHECK_GUS 1044 #define IDC_CHECK_GUS 1044
#define IDC_COMBO_MIDI 1045 #define IDC_COMBO_MIDI_OUT 1045
#define IDC_CHECK_MPU401 1046 #define IDC_CHECK_MPU401 1046
#define IDC_CONFIGURE_MPU401 1047 #define IDC_CONFIGURE_MPU401 1047
#define IDC_CHECK_FLOAT 1048 #define IDC_CHECK_FLOAT 1048
@@ -281,7 +281,7 @@
#define IDC_CONFIGURE_BUSLOGIC 1305 #define IDC_CONFIGURE_BUSLOGIC 1305
#define IDC_CONFIGURE_PCAP 1306 #define IDC_CONFIGURE_PCAP 1306
#define IDC_CONFIGURE_NET 1307 #define IDC_CONFIGURE_NET 1307
#define IDC_CONFIGURE_MIDI 1308 #define IDC_CONFIGURE_MIDI_OUT 1308
#define IDC_CONFIGURE_MIDI_IN 1309 #define IDC_CONFIGURE_MIDI_IN 1309
#define IDC_JOY1 1310 #define IDC_JOY1 1310
#define IDC_JOY2 1311 #define IDC_JOY2 1311

4
src/win/languages/dialogs.rc
View File

@@ -169,10 +169,10 @@ BEGIN
LTEXT STR_SOUND,IDT_1711,7,9,59,10 LTEXT STR_SOUND,IDT_1711,7,9,59,10
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_SND,214,7,46,12
COMBOBOX IDC_COMBO_MIDI,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | COMBOBOX IDC_COMBO_MIDI_OUT,71,26,140,120,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP WS_TABSTOP
LTEXT STR_MIDI,IDT_1712,7,28,59,10 LTEXT STR_MIDI,IDT_1712,7,28,59,10
PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI,214,26,46,12 PUSHBUTTON STR_CONFIGURE,IDC_CONFIGURE_MIDI_OUT,214,26,46,12
COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL | COMBOBOX IDC_COMBO_MIDI_IN,71,45,140,120,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP WS_TABSTOP

6
src/win/win_settings.c
View File

@@ -1346,7 +1346,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
c++; c++;
} }
settings_enable_window(hdlg, IDC_CONFIGURE_MIDI, midi_device_has_config(temp_midi_device)); settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device));
c = d = 0; c = d = 0;
settings_reset_content(hdlg, IDC_COMBO_MIDI_IN); settings_reset_content(hdlg, IDC_COMBO_MIDI_IN);
@@ -1406,13 +1406,13 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
case IDC_COMBO_MIDI: case IDC_COMBO_MIDI:
temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)];
settings_enable_window(hdlg, IDC_CONFIGURE_MIDI, midi_device_has_config(temp_midi_device)); settings_enable_window(hdlg, IDC_CONFIGURE_MIDI_OUT, midi_device_has_config(temp_midi_device));
settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401); settings_set_check(hdlg, IDC_CHECK_MPU401, temp_mpu401);
settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow()); settings_enable_window(hdlg, IDC_CHECK_MPU401, mpu401_standalone_allow());
settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401); settings_enable_window(hdlg, IDC_CONFIGURE_MPU401, mpu401_standalone_allow() && temp_mpu401);
break; break;
case IDC_CONFIGURE_MIDI: case IDC_CONFIGURE_MIDI_OUT:
temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)]; temp_midi_device = settings_list_to_midi[settings_get_cur_sel(hdlg, IDC_COMBO_MIDI)];
temp_deviceconfig |= deviceconfig_open(hdlg, (void *)midi_device_getdevice(temp_midi_device)); temp_deviceconfig |= deviceconfig_open(hdlg, (void *)midi_device_getdevice(temp_midi_device));
break; break;