diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp index ac500d5e6f..c9916aefef 100644 --- a/Windows/MainWindowMenu.cpp +++ b/Windows/MainWindowMenu.cpp @@ -74,12 +74,12 @@ namespace MainWindow { MENU_FILE = 0, MENU_EMULATION = 1, MENU_DEBUG = 2, - MENU_MOVIE = 3, - MENU_OPTIONS = 4, - MENU_HELP = 5, + MENU_OPTIONS = 3, + MENU_HELP = 4, // File submenus SUBMENU_FILE_SAVESTATE_SLOT = 6, + SUBMENU_FILE_RECORD = 11, // Emulation submenus SUBMENU_DISPLAY_ROTATION = 4, @@ -218,7 +218,6 @@ namespace MainWindow { TranslateMenu(menu, "File", MENU_FILE); TranslateMenu(menu, "Emulation", MENU_EMULATION); TranslateMenu(menu, "Debugging", MENU_DEBUG); - TranslateMenu(menu, "Movie", MENU_MOVIE); TranslateMenu(menu, "Game Settings", MENU_OPTIONS); TranslateMenu(menu, "Help", MENU_HELP); @@ -234,6 +233,7 @@ namespace MainWindow { TranslateMenuItem(menu, ID_FILE_QUICKSAVESTATE, L"\tF2"); TranslateMenuItem(menu, ID_FILE_LOADSTATEFILE); TranslateMenuItem(menu, ID_FILE_SAVESTATEFILE); + TranslateSubMenu(menu, "Record", MENU_FILE, SUBMENU_FILE_RECORD); TranslateMenuItem(menu, ID_FILE_EXIT, L"\tAlt+F4"); // Emulation menu @@ -274,9 +274,9 @@ namespace MainWindow { TranslateMenuItem(menu, ID_OPTIONS_DISPLAY_LAYOUT); // Movie menu - TranslateMenuItem(menu, ID_MOVIE_DUMPFRAMES); - TranslateMenuItem(menu, ID_MOVIE_USEFFV1); - TranslateMenuItem(menu, ID_MOVIE_DUMPAUDIO); + TranslateMenuItem(menu, ID_FILE_DUMPFRAMES); + TranslateMenuItem(menu, ID_FILE_USEFFV1); + TranslateMenuItem(menu, ID_FILE_DUMPAUDIO); // Skip display multipliers x1-x10 TranslateMenuItem(menu, ID_OPTIONS_FULLSCREEN, L"\tAlt+Return, F11"); @@ -935,15 +935,15 @@ namespace MainWindow { g_TakeScreenshot = true; break; - case ID_MOVIE_DUMPFRAMES: + case ID_FILE_DUMPFRAMES: g_Config.bDumpFrames = !g_Config.bDumpFrames; break; - case ID_MOVIE_USEFFV1: + case ID_FILE_USEFFV1: g_Config.bUseFFV1 = !g_Config.bUseFFV1; break; - case ID_MOVIE_DUMPAUDIO: + case ID_FILE_DUMPAUDIO: g_Config.bDumpAudio = !g_Config.bDumpAudio; break; @@ -985,9 +985,9 @@ namespace MainWindow { CHECKITEM(ID_TEXTURESCALING_DEPOSTERIZE, g_Config.bTexDeposterize); CHECKITEM(ID_EMULATION_CHEATS, g_Config.bEnableCheats); CHECKITEM(ID_OPTIONS_IGNOREWINKEY, g_Config.bIgnoreWindowsKey); - CHECKITEM(ID_MOVIE_DUMPFRAMES, g_Config.bDumpFrames); - CHECKITEM(ID_MOVIE_USEFFV1, g_Config.bUseFFV1); - CHECKITEM(ID_MOVIE_DUMPAUDIO, g_Config.bDumpAudio); + CHECKITEM(ID_FILE_DUMPFRAMES, g_Config.bDumpFrames); + CHECKITEM(ID_FILE_USEFFV1, g_Config.bUseFFV1); + CHECKITEM(ID_FILE_DUMPAUDIO, g_Config.bDumpAudio); static const int displayrotationitems[] = { ID_EMULATION_ROTATION_H, diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc index 5962e1611b..233dfd8105 100644 --- a/Windows/ppsspp.rc +++ b/Windows/ppsspp.rc @@ -404,6 +404,14 @@ BEGIN MENUITEM "Save State", ID_FILE_QUICKSAVESTATE MENUITEM "Load State File...", ID_FILE_LOADSTATEFILE MENUITEM "Save State File...", ID_FILE_SAVESTATEFILE + + POPUP "Record" + BEGIN + MENUITEM "Record Display", ID_FILE_DUMPFRAMES + MENUITEM "Use Lossless Video Codec (FFV1)", ID_FILE_USEFFV1 + MENUITEM SEPARATOR + MENUITEM "Record Audio", ID_FILE_DUMPAUDIO + END MENUITEM SEPARATOR MENUITEM "Exit", ID_FILE_EXIT END @@ -445,13 +453,6 @@ BEGIN MENUITEM "Memory View...", ID_DEBUG_MEMORYVIEW END - POPUP "Movie" - BEGIN - MENUITEM "Record Display", ID_MOVIE_DUMPFRAMES - MENUITEM "Use Lossless Video Codec (FFV1)", ID_MOVIE_USEFFV1 - MENUITEM "Export Audio", ID_MOVIE_DUMPAUDIO - END - POPUP "Options" BEGIN MENUITEM "Keep PPSSPP On Top", ID_OPTIONS_TOPMOST diff --git a/Windows/resource.h b/Windows/resource.h index 40e0cefa83..37e054bcaa 100644 --- a/Windows/resource.h +++ b/Windows/resource.h @@ -328,9 +328,9 @@ #define IDC_GEDBG_BREAKTARGET 40162 #define ID_GEDBG_COPYALL 40163 #define ID_GEDBG_WATCH 40164 -#define ID_MOVIE_DUMPFRAMES 40165 -#define ID_MOVIE_USEFFV1 40166 -#define ID_MOVIE_DUMPAUDIO 40167 +#define ID_FILE_DUMPFRAMES 40165 +#define ID_FILE_USEFFV1 40166 +#define ID_FILE_DUMPAUDIO 40167 // Dummy option to let the buffered rendering hotkey cycle through all the options. #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500