Removed unnecessary CD32 FMV checkbox

diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h
index 712316a3ae58dfb64c72ddef0073968bd2858bcf..5e0641099b89e0e66f62237f3dafc3506fa3dd68 100644 (file)
--- a/od-win32/resources/resource.h
+++ b/od-win32/resources/resource.h
@@ -1168,7 +1168,6 @@
 #define IDC_DBG_CUSTOM                  1766
 #define IDC_DBG_MISCCPU                 1767
 #define IDC_CS_DMAC2                    1769
-#define IDC_CS_CD32FMV                  1771
 #define IDC_DF0ENABLE                   1773
 #define IDC_DF1ENABLE                   1774
 #define IDC_FS_SELECT_DIR               1774

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index 7cf66e8f70e43760215b82b8150f056bf5e0c5ec..f3405b375678092f6c561223cf80d3782b56ce62 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -1390,7 +1390,6 @@ BEGIN
     CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,259,180,11
     CONTROL         "uaenet.device [] Sana 2 compatible network device emulation.",IDC_SANA2,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,243,187,11
-    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,193,259,193,11
     EDITTEXT        IDC_EXPANSIONBOARDSTRINGBOX,202,112,172,14,ES_AUTOHSCROLL
     COMBOBOX        IDC_EXPANSIONBOARDSELECTOR,202,112,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_ACCELERATORBOARDCHECKBOX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,206,99,12

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 6bb83e582dc9479157bf6517357e77171ad61bf7..a9ea0571a793ee5b9083351c39f0a4bd2eb29c3c 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -10969,8 +10969,6 @@ static void enable_for_expansion2dlg (HWND hDlg)
        ew(hDlg, IDC_CATWEASEL, en);
        ew(hDlg, IDC_SANA2, en);
 
-       ew(hDlg, IDC_CS_CD32FMV, en);
-
        ew(hDlg, IDC_CPUBOARDROMFILE, workprefs.cpuboard_type != 0);
        ew(hDlg, IDC_CPUBOARDROMCHOOSER, workprefs.cpuboard_type != 0);
        ew(hDlg, IDC_CPUBOARDMEM, workprefs.cpuboard_type > 0);
@@ -11005,7 +11003,6 @@ static void values_to_expansion2dlg (HWND hDlg, int mode)
        CheckDlgButton(hDlg, IDC_CATWEASEL, workprefs.catweasel);
        CheckDlgButton(hDlg, IDC_SCSIDEVICE, workprefs.scsi == 1);
        CheckDlgButton(hDlg, IDC_SANA2, workprefs.sana2);
-       CheckDlgButton(hDlg, IDC_CS_CD32FMV, workprefs.cs_cd32fmv);
        cw = catweasel_detect ();
        ew (hDlg, IDC_CATWEASEL, cw);
        if (!cw && workprefs.catweasel < 100)
@@ -11193,9 +11190,6 @@ static INT_PTR CALLBACK Expansion2DlgProc(HWND hDlg, UINT msg, WPARAM wParam, LP
                                workprefs.catweasel = ischecked(hDlg, IDC_CATWEASEL) ? -1 : 0;
                                cfgfile_compatibility_romtype(&workprefs);
                                break;
-                               case IDC_CS_CD32FMV:
-                               workprefs.cs_cd32fmv = ischecked(hDlg, IDC_CS_CD32FMV) ? 1 : 0;
-                               cfgfile_compatibility_romtype(&workprefs);
                                break;
                                case IDC_SCSIROMSELECTED:
                                values_from_expansion2dlg(hDlg);