From ce8bcd1b837b2ee4056544a51dfbb2a5d43f3516 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 23 Nov 2008 22:20:00 +0000 Subject: [PATCH] Win32 - Movie Subtitle Toggle fixes and added to Hotkeys --- src/drivers/win/res.rc | 2 +- src/drivers/win/resource.h | 3 ++- src/drivers/win/window.cpp | 12 +++++++++--- src/input.cpp | 12 +++++++++++- src/input.h | 36 ++---------------------------------- 5 files changed, 25 insertions(+), 40 deletions(-) diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 82a322c7..40445b17 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -92,7 +92,7 @@ BEGIN END MENUITEM "Lag Counter", MENU_DISPLAY_LAGCOUNTER MENUITEM "Frame Counter", ID_DISPLAY_FRAMECOUNTER - MENUITEM "Move Subtitles", ID_DISPLAY_MOVESUBTITLES + MENUITEM "Movie Subtitles", ID_DISPLAY_MOVIESUBTITLES MENUITEM SEPARATOR MENUITEM "Graphics: BG", MENU_DISPLAY_BG MENUITEM "Graphics: OBJ", MENU_DISPLAY_OBJ diff --git a/src/drivers/win/resource.h b/src/drivers/win/resource.h index 6022ad4f..6ac7ee90 100644 --- a/src/drivers/win/resource.h +++ b/src/drivers/win/resource.h @@ -562,6 +562,7 @@ #define MEMVIEW_HELP 40257 #define MENU_MV_HELP 40258 #define ID_DISPLAY_MOVESUBTITLES 40259 +#define ID_DISPLAY_MOVIESUBTITLES 40260 #define IDC_DEBUGGER_ICONTRAY 55535 #define MW_ValueLabel2 65423 #define MW_ValueLabel1 65426 @@ -571,7 +572,7 @@ #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 124 -#define _APS_NEXT_COMMAND_VALUE 40260 +#define _APS_NEXT_COMMAND_VALUE 40261 #define _APS_NEXT_CONTROL_VALUE 1187 #define _APS_NEXT_SYMED_VALUE 101 #endif diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index b55afd93..73f96bae 100644 --- a/src/drivers/win/window.cpp +++ b/src/drivers/win/window.cpp @@ -310,7 +310,7 @@ void UpdateCheckedMenuItems() CheckMenuItem(fceumenu, MENU_DISPLAY_LAGCOUNTER, lagCounterDisplay?MF_CHECKED : MF_UNCHECKED); CheckMenuItem(fceumenu, MENU_DISPLAY_BG, bg?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(fceumenu, MENU_DISPLAY_OBJ, spr?MF_CHECKED:MF_UNCHECKED); - CheckMenuItem(fceumenu, ID_DISPLAY_MOVESUBTITLES, movieSubtitles?MF_CHECKED:MF_UNCHECKED); + CheckMenuItem(fceumenu, ID_DISPLAY_MOVIESUBTITLES, movieSubtitles?MF_CHECKED:MF_UNCHECKED); CheckMenuItem(fceumenu, MENU_PAUSEAFTERPLAYBACK, pauseAfterPlayback ? MF_CHECKED : MF_UNCHECKED); CheckMenuItem(fceumenu, MENU_RUN_IN_BACKGROUND, eoptions & EO_BGRUN ? MF_CHECKED : MF_UNCHECKED); @@ -1028,8 +1028,10 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) UpdateCheckedMenuItems(); break; - case ID_DISPLAY_MOVESUBTITLES: + case ID_DISPLAY_MOVIESUBTITLES: movieSubtitles ^= 1; + if (movieSubtitles) FCEU_DispMessage("Movie subtitles on"); + else FCEU_DispMessage("Movie subtitles off"); UpdateCheckedMenuItems(); break; @@ -1041,7 +1043,6 @@ LRESULT FAR PASCAL AppWndProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam) case MENU_GAME_GENIE: // Game Genie menu was selected - genie ^= 1; FCEUI_SetGameGenie(genie!=0); UpdateCheckedMenuItems(); @@ -1893,6 +1894,11 @@ void UpdateMenuHotkeys() combined = "Frame Counter\t" + combo; ChangeMenuItemText(ID_DISPLAY_FRAMECOUNTER, combined); + //Movie Subtitles + combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_MOVIESUBTITLES]); + combined = "Movie Subtitles\t" + combo; + ChangeMenuItemText(ID_DISPLAY_MOVIESUBTITLES, combined); + //Graphics: BG combo = GetKeyComboName(FCEUD_CommandMapping[EMUCMD_MISC_DISPLAY_BG_TOGGLE]); combined = "Graphics: BG\t" + combo; diff --git a/src/input.cpp b/src/input.cpp index 6eaa6a28..30e143d2 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -78,6 +78,7 @@ unsigned int lagCounter; bool lagCounterDisplay; char lagFlag; extern bool frameAdvanceLagSkip; +extern bool movieSubtitles; //------------- static uint8 joy_readbit[2]; @@ -592,6 +593,7 @@ static void LaunchCodeDataLogger(void); static void FA_SkipLag(void); static void OpenRom(void); static void CloseRom(void); +static void MovieSubtitleToggle(void); struct EMUCMDTABLE FCEUI_CommandTable[]= { @@ -701,7 +703,8 @@ struct EMUCMDTABLE FCEUI_CommandTable[]= { EMUCMD_TOOL_OPENCDLOGGER, EMUCMDTYPE_TOOL, LaunchCodeDataLogger, 0, 0, "Open Code/Data Logger", 0}, { EMUCMD_FRAMEADV_SKIPLAG, EMUCMDTYPE_MISC, FA_SkipLag, 0, 0, "Frame Adv.-Skip Lag", 0}, { EMUCMD_OPENROM, EMUCMDTYPE_TOOL, OpenRom, 0, 0, "Open ROM", 0}, - { EMUCMD_CLOSEROM, EMUCMDTYPE_TOOL, CloseRom, 0, 0, "Close ROM", 0} + { EMUCMD_CLOSEROM, EMUCMDTYPE_TOOL, CloseRom, 0, 0, "Close ROM", 0}, + { EMUCMD_MISC_DISPLAY_MOVIESUBTITLES, EMUCMDTYPE_MISC, MovieSubtitleToggle,0,0,"Toggle Movie Subtitles", 0} }; #define NUM_EMU_CMDS (sizeof(FCEUI_CommandTable)/sizeof(FCEUI_CommandTable[0])) @@ -902,4 +905,11 @@ static void CloseRom(void) #ifdef WIN32 CloseGame(); #endif +} + +static void MovieSubtitleToggle(void) +{ + movieSubtitles ^= 1; + if (movieSubtitles) FCEU_DispMessage("Movie subtitles on"); + else FCEU_DispMessage("Movie subtitles off"); } \ No newline at end of file diff --git a/src/input.h b/src/input.h index d5294ae5..1340151a 100644 --- a/src/input.h +++ b/src/input.h @@ -154,42 +154,8 @@ enum EMUCMD EMUCMD_LOAD_STATE_SLOT_8, EMUCMD_LOAD_STATE_SLOT_9, -/* EMUCMD_MOVIE_SLOT_0, - EMUCMD_MOVIE_SLOT_1, - EMUCMD_MOVIE_SLOT_2, - EMUCMD_MOVIE_SLOT_3, - EMUCMD_MOVIE_SLOT_4, - EMUCMD_MOVIE_SLOT_5, - EMUCMD_MOVIE_SLOT_6, - EMUCMD_MOVIE_SLOT_7, - EMUCMD_MOVIE_SLOT_8, - EMUCMD_MOVIE_SLOT_9, - EMUCMD_MOVIE_SLOT_NEXT, - EMUCMD_MOVIE_SLOT_PREV, - EMUCMD_MOVIE_RECORD,*/ EMUCMD_MOVIE_RECORD_TO, -/* EMUCMD_MOVIE_RECORD_SLOT_0, - EMUCMD_MOVIE_RECORD_SLOT_1, - EMUCMD_MOVIE_RECORD_SLOT_2, - EMUCMD_MOVIE_RECORD_SLOT_3, - EMUCMD_MOVIE_RECORD_SLOT_4, - EMUCMD_MOVIE_RECORD_SLOT_5, - EMUCMD_MOVIE_RECORD_SLOT_6, - EMUCMD_MOVIE_RECORD_SLOT_7, - EMUCMD_MOVIE_RECORD_SLOT_8, - EMUCMD_MOVIE_RECORD_SLOT_9, - EMUCMD_MOVIE_REPLAY,*/ EMUCMD_MOVIE_REPLAY_FROM, -/* EMUCMD_MOVIE_REPLAY_SLOT_0, - EMUCMD_MOVIE_REPLAY_SLOT_1, - EMUCMD_MOVIE_REPLAY_SLOT_2, - EMUCMD_MOVIE_REPLAY_SLOT_3, - EMUCMD_MOVIE_REPLAY_SLOT_4, - EMUCMD_MOVIE_REPLAY_SLOT_5, - EMUCMD_MOVIE_REPLAY_SLOT_6, - EMUCMD_MOVIE_REPLAY_SLOT_7, - EMUCMD_MOVIE_REPLAY_SLOT_8, - EMUCMD_MOVIE_REPLAY_SLOT_9,*/ EMUCMD_MOVIE_PLAY_FROM_BEGINNING, EMUCMD_MOVIE_STOP, EMUCMD_MOVIE_READONLY_TOGGLE, @@ -229,6 +195,7 @@ enum EMUCMD EMUCMD_MISC_DISPLAY_BG_TOGGLE, EMUCMD_MISC_DISPLAY_OBJ_TOGGLE, EMUCMD_MISC_DISPLAY_LAGCOUNTER_TOGGLE, + EMUCMD_MISC_LAGCOUNTER_RESET, //Currently Windows only------ EMUCMD_TOOL_OPENMEMORYWATCH, @@ -244,6 +211,7 @@ enum EMUCMD EMUCMD_OPENROM, EMUCMD_CLOSEROM, //----------------------------- + EMUCMD_MISC_DISPLAY_MOVIESUBTITLES, EMUCMD_MAX };