diff --git a/src/include/86box/cdrom.h b/src/include/86box/cdrom.h index d2f032280..a32177b05 100644 --- a/src/include/86box/cdrom.h +++ b/src/include/86box/cdrom.h @@ -165,7 +165,7 @@ typedef struct cdrom { char *image_history[CD_IMAGE_HISTORY]; uint32_t sound_on, cdrom_capacity, - early, seek_pos, + seek_pos, seek_diff, cd_end, type; int host_drive, prev_host_drive, diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h index 431f42134..c0867efef 100644 --- a/src/include/86box/resource.h +++ b/src/include/86box/resource.h @@ -302,7 +302,7 @@ #define IDC_COMBO_CD_ID 1157 #define IDC_COMBO_CD_LUN 1158 #define IDC_COMBO_CD_CHANNEL_IDE 1159 -#define IDC_CHECKEARLY 1160 +//#define IDC_CHECKEARLY 1160 #define IDC_LIST_ZIP_DRIVES 1170 /* other removable devices config */ #define IDC_COMBO_ZIP_BUS 1171 diff --git a/src/win/languages/dialogs.rc b/src/win/languages/dialogs.rc index 83d81e074..cd62722cd 100644 --- a/src/win/languages/dialogs.rc +++ b/src/win/languages/dialogs.rc @@ -834,9 +834,11 @@ BEGIN 33, 205, 140, 12, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +/* CONTROL STR_EARLY, IDC_CHECKEARLY, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 186, 206, 84, CFG_CHECKBOX_HEIGHT +*/ END DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE CFG_PANE_LEFT, CFG_PANE_TOP, CFG_PANE_WIDTH, CFG_PANE_HEIGHT diff --git a/src/win/win_settings.c b/src/win/win_settings.c index ceee9fa37..bc6218a81 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -4014,6 +4014,7 @@ win_settings_cdrom_drives_recalc_list(HWND hdlg) if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; +/* lvI.iSubItem = 2; lvI.pszText = plat_get_string(temp_cdrom[i].early ? IDS_2060 : IDS_2061); lvI.iItem = i; @@ -4021,6 +4022,7 @@ win_settings_cdrom_drives_recalc_list(HWND hdlg) if (ListView_SetItem(hwndList, &lvI) == -1) return FALSE; +*/ } return TRUE; @@ -4489,6 +4491,7 @@ win_settings_cdrom_drives_update_item(HWND hdlg, int i) if (ListView_SetItem(hwndList, &lvI) == -1) return; +/* lvI.iSubItem = 2; lvI.pszText = plat_get_string(temp_cdrom[i].early ? IDS_2060 : IDS_2061); lvI.iItem = i; @@ -4496,6 +4499,7 @@ win_settings_cdrom_drives_update_item(HWND hdlg, int i) if (ListView_SetItem(hwndList, &lvI) == -1) return; +*/ } static void @@ -4647,11 +4651,12 @@ cdrom_recalc_location_controls(HWND hdlg, int assign_id) settings_show_window(hdlg, IDC_COMBO_CD_CHANNEL_IDE, FALSE); settings_show_window(hdlg, IDC_COMBO_CD_SPEED, bus != CDROM_BUS_DISABLED); settings_show_window(hdlg, IDT_CD_SPEED, bus != CDROM_BUS_DISABLED); +/* settings_show_window(hdlg, IDC_CHECKEARLY, bus != CDROM_BUS_DISABLED); - +*/ if (bus != CDROM_BUS_DISABLED) { settings_set_cur_sel(hdlg, IDC_COMBO_CD_SPEED, temp_cdrom[lv2_current_sel].speed - 1); - settings_set_check(hdlg, IDC_CHECKEARLY, temp_cdrom[lv2_current_sel].early); +// settings_set_check(hdlg, IDC_CHECKEARLY, temp_cdrom[lv2_current_sel].early); } switch (bus) { @@ -5042,10 +5047,12 @@ win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel); break; +/* case IDC_CHECKEARLY: temp_cdrom[lv2_current_sel].early = settings_get_check(hdlg, IDC_CHECKEARLY); win_settings_cdrom_drives_update_item(hdlg, lv2_current_sel); break; +*/ } ignore_change = 0;