diff --git a/src/drivers/win/config.cpp b/src/drivers/win/config.cpp index 1e0cba8f..1b82abdd 100644 --- a/src/drivers/win/config.cpp +++ b/src/drivers/win/config.cpp @@ -214,6 +214,7 @@ static CFGSTRUCT fceuconfig[] = { AC(movieSubtitles), AC(subtitlesOnAVI), AC(bindSavestate), + AC(autoMovieBackup), AC(ClipSidesOffset), AC(PPUViewRefresh), AC(NTViewRefresh), diff --git a/src/drivers/win/movieoptions.cpp b/src/drivers/win/movieoptions.cpp index 50db9366..6e69c1ea 100644 --- a/src/drivers/win/movieoptions.cpp +++ b/src/drivers/win/movieoptions.cpp @@ -37,7 +37,7 @@ void UpdateCheckBoxes(HWND hwndDlg) CheckDlgButton(hwndDlg, IDC_MOVIE_BINDSAVESTATES, bindSavestate ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MOVIE_DISPLAYSTATUSICON, status_icon ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MOVIE_DISPLAYSUBTITLES, movieSubtitles ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MOVIE_DISPLAYSUBTITLES, subtitlesOnAVI ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MOVIE_SUBTITLESINAVI, subtitlesOnAVI ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MOVIE_AUTOBACKUP, autoMovieBackup ? BST_CHECKED : BST_UNCHECKED); } @@ -78,7 +78,7 @@ BOOL CALLBACK MovieOptionsCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l break; case IDC_MOVIE_DISPLAYSTATUSICON: - status_icon = pauseAfterPlayback?0:1; + status_icon = status_icon?0:1; break; case IDC_MOVIE_DISPLAYSUBTITLES: diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 1c2654f1..7e481e9e 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -99,15 +99,12 @@ BEGIN POPUP "&Config" BEGIN MENUITEM "Hide Menu", MENU_HIDE_MENU - MENUITEM "Pause After Playback", MENU_PAUSEAFTERPLAYBACK MENUITEM "Enable Run in Background", MENU_RUN_IN_BACKGROUND MENUITEM "Enable Background Input", MENU_BACKGROUND_INPUT MENUITEM "Enable Auto-save", MENU_ENABLE_AUTOSAVE MENUITEM "Frame Adv. - Skip Lag", MENU_DISPLAY_FA_LAGSKIP - MENUITEM "Bind savestates to movie", MENU_CONFIG_BINDSAVES POPUP "Display" BEGIN - MENUITEM "Movie Status Icon", MENU_SHOW_STATUS_ICON POPUP "Input Display" BEGIN MENUITEM "Off", MENU_INPUTDISPLAY_0 @@ -117,8 +114,6 @@ BEGIN END MENUITEM "Lag Counter", MENU_DISPLAY_LAGCOUNTER MENUITEM "Frame Counter", ID_DISPLAY_FRAMECOUNTER - MENUITEM "Movie Subtitles", ID_DISPLAY_MOVIESUBTITLES - MENUITEM "Movie Subtitles in AVI", ID_DISPLAY_MOVIESUBTITLES_AVI MENUITEM SEPARATOR MENUITEM "Graphics: BG", MENU_DISPLAY_BG MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 241413bd..0a7136f8 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -1043,10 +1043,6 @@ UpdateContextMenuItems(hfceuxcontextsub, whichContext); case MENU_HIDE_MENU: ToggleHideMenu(); break; - case MENU_PAUSEAFTERPLAYBACK: - pauseAfterPlayback = pauseAfterPlayback?0:1; - UpdateCheckedMenuItems(); - break; case MENU_RUN_IN_BACKGROUND: eoptions ^= EO_BGRUN; if((eoptions & EO_BGRUN) == 0) @@ -1072,15 +1068,8 @@ UpdateContextMenuItems(hfceuxcontextsub, whichContext); frameAdvanceLagSkip ^= 1; UpdateCheckedMenuItems(); break; - case MENU_CONFIG_BINDSAVES: - bindSavestate ^= 1; - UpdateCheckedMenuItems(); - + //Display submenu - case MENU_SHOW_STATUS_ICON: - status_icon = !status_icon; - UpdateCheckedMenuItems(); - break; case MENU_INPUTDISPLAY_0: //Input display off input_display = 0; UpdateCheckedMenuItems(); @@ -1105,16 +1094,6 @@ UpdateContextMenuItems(hfceuxcontextsub, whichContext); FCEUI_MovieToggleFrameDisplay(); UpdateCheckedMenuItems(); break; - case ID_DISPLAY_MOVIESUBTITLES: - movieSubtitles ^= 1; - if (movieSubtitles) FCEU_DispMessage("Movie subtitles on"); - else FCEU_DispMessage("Movie subtitles off"); - UpdateCheckedMenuItems(); - break; - case ID_DISPLAY_MOVIESUBTITLES_AVI: - subtitlesOnAVI ^= 1; - UpdateCheckedMenuItems(); - break; case MENU_DISPLAY_BG: case MENU_DISPLAY_OBJ: {