ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged "Stop AVI" to "Record AVI"

This commit is contained in:
gocha 2009-05-17 22:58:35 +00:00
parent 3e53a28f3c
commit 503108cfa1
4 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desmume/src/windows/hotkey.cpp
View File

@ -31,6 +31,7 @@
#include "ramwatch.h" //In order to call UpdateRamWatch (for loadstate functions)
#include "ram_search.h" //In order to call UpdateRamSearch (for loadstate functions)
#include "replay.h"
#include "aviout.h"
extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function
@ -167,8 +168,7 @@ void HK_AutoHoldClearKeyDown(int) {
void HK_Reset(int) {ResetGame();}
void HK_RecordAVI(int) {AviRecordTo();}
void HK_StopAVI(int) {AviEnd();}
void HK_RecordAVI(int) { if (DRV_AviIsRecording()) AviEnd(); else AviRecordTo(); }
void HK_ToggleFrame(int) {frameCounterDisplay ^= true;}
void HK_ToggleFPS(int) {FpsDisplay ^= true;}
@ -441,12 +441,6 @@ void InitCustomKeys (SCustomKeys *keys)
keys->RecordAVI.page = HOTKEY_PAGE_MAIN;
keys->RecordAVI.key = NULL;
keys->StopAVI.handleKeyDown = HK_StopAVI;
keys->StopAVI.code = "StopAVI";
keys->StopAVI.name = L"Stop AVI";
keys->StopAVI.page = HOTKEY_PAGE_MAIN;
keys->StopAVI.key = NULL;
//Turbo Page---------------------------------------
keys->TurboRight.handleKeyDown = HK_TurboRightKeyDown;
keys->TurboRight.handleKeyUp = HK_TurboRightKeyUp;

2
desmume/src/windows/hotkey.h
View File

@ -78,7 +78,7 @@ struct SCustomKeys
SCustomKey ToggleRasterizer;
SCustomKey PrintScreen; //Screenshot
SCustomKey RecordAVI, StopAVI;
SCustomKey RecordAVI;
SCustomKey ToggleFrameCounter;
SCustomKey ToggleFPS;

21
desmume/src/windows/main.cpp
View File

@ -2514,21 +2514,24 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
{
UpdateHotkeyAssignments(); //Add current hotkey mappings to menu item names
MENUITEMINFO mii;
TCHAR menuItemString[256];
ZeroMemory(&mii, sizeof(MENUITEMINFO));
//Check if AVI is recording
EnableMenuItem(mainMenu, IDM_FILE_RECORDAVI, MF_BYCOMMAND | (!DRV_AviIsRecording()) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_FILE_STOPAVI, MF_BYCOMMAND | (DRV_AviIsRecording()) ? MF_ENABLED : MF_GRAYED);
mii.cbSize = sizeof(MENUITEMINFO);
mii.fMask = MIIM_STRING;
LoadString(hAppInst, !DRV_AviIsRecording() ? IDM_FILE_RECORDAVI : IDM_FILE_STOPAVI, menuItemString, 256);
mii.dwTypeData = menuItemString;
SetMenuItemInfo(mainMenu, IDM_FILE_RECORDAVI, FALSE, &mii);
//Menu items dependent on a ROM loaded
EnableMenuItem(mainMenu, IDM_GAME_INFO, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_IMPORTBACKUPMEMORY,MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_FILE_RECORDAVI, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_FILE_STOPAVI, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_STATE_SAVE, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_STATE_LOAD, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_PRINTSCREEN, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_QUICK_PRINTSCREEN, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_FILE_RECORDAVI, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_FILE_STOPAVI, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_RESET, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_SHUT_UP, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
EnableMenuItem(mainMenu, IDM_CHEATS_LIST, MF_BYCOMMAND | (romloaded) ? MF_ENABLED : MF_GRAYED);
@ -2859,10 +2862,10 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM
}
return 0;
case IDM_FILE_RECORDAVI:
AviRecordTo();
break;
case IDM_FILE_STOPAVI:
AviEnd();
if (DRV_AviIsRecording())
AviEnd();
else
AviRecordTo();
break;
case IDM_STATE_LOAD:
{

38
desmume/src/windows/resources.rc
View File

@ -69,7 +69,6 @@ MENU_PRINCIPAL MENU
MENUITEM "&Hurtigt Skærmbillede", IDM_QUICK_PRINTSCREEN
MENUITEM SEPARATOR
MENUITEM "Record AVI", IDM_FILE_RECORDAVI
MENUITEM "Stop AVI", IDM_FILE_STOPAVI
MENUITEM SEPARATOR
MENUITEM "&Afslut\tAlt F4", IDM_QUIT
}
@ -241,7 +240,6 @@ MENU_PRINCIPAL MENU
MENUITEM "&Quick Screenshot", IDM_QUICK_PRINTSCREEN
MENUITEM SEPARATOR
MENUITEM "Record AVI", IDM_FILE_RECORDAVI
MENUITEM "Stop AVI", IDM_FILE_STOPAVI
MENUITEM SEPARATOR
MENUITEM "&Record Movie...", IDM_RECORD_MOVIE
MENUITEM "&Play Movie...", IDM_PLAY_MOVIE
@ -422,7 +420,6 @@ MENU_PRINCIPAL MENU
MENUITEM "Capture d'écran rapide", IDM_QUICK_PRINTSCREEN
MENUITEM SEPARATOR
MENUITEM "Enregistrer une vidéo", IDM_FILE_RECORDAVI
MENUITEM "Arrêter l'enregistrement", IDM_FILE_STOPAVI
MENUITEM SEPARATOR
MENUITEM "&Quitter\tAlt F4", IDM_QUIT
}
@ -915,7 +912,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
LTEXT "Gå til:", IDC_STATIC, 130, 4, 33, 10, SS_LEFT
LTEXT "G<EFBFBD>Etil:", IDC_STATIC, 130, 4, 33, 10, SS_LEFT
EDITTEXT IDC_GOTODES, 155, 1, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_UPPERCASE | ES_WANTRETURN
PUSHBUTTON "&Start", IDC_GO, 240, 1, 20, 14, BS_PUSHBUTTON
CONTROL "Rediger", IDC_DES_BOX, "DesViewBox7", 0x50210000, 4, 16, 296, 150, 0x00000200
@ -1101,7 +1098,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
LTEXT "Gå til:", IDC_STATIC, 130, 4, 33, 10, SS_LEFT
LTEXT "G<EFBFBD>Etil:", IDC_STATIC, 130, 4, 33, 10, SS_LEFT
EDITTEXT IDC_GOTODES, 155, 1, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_UPPERCASE | ES_WANTRETURN
PUSHBUTTON "&Start", IDC_GO, 240, 1, 20, 14, BS_PUSHBUTTON
CONTROL "Rediger", IDC_DES_BOX, "DesViewBox9", 0x50210000, 4, 16, 296, 150, 0x00000200
@ -3254,7 +3251,7 @@ CAPTION "OAM Fremviser"
FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST
SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT
LTEXT "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT
LTEXT "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT
@ -3290,7 +3287,7 @@ CAPTION "OAM Viewer"
FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST
SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT
LTEXT "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT
LTEXT "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT
@ -3326,7 +3323,7 @@ CAPTION "OAM Viewer"
FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWNLIST
SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT
LTEXT "Tile :", IDC_STATIC, 4, 46, 45, 8, SS_LEFT
LTEXT "Palette :", IDC_STATIC, 4, 56, 45, 8, SS_LEFT
@ -3363,7 +3360,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT
SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
PUSHBUTTON "&Luk", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON
AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX
EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY
@ -3381,7 +3378,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT
SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
PUSHBUTTON "&Close", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON
AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX
EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY
@ -3399,7 +3396,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT
SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
PUSHBUTTON "&Fermer", IDC_FERMER, 35, 169, 50, 14, BS_PUSHBUTTON
AUTOCHECKBOX "&Auto-update", IDC_AUTO_UPDATE, 13, 150, 54, 14, BS_AUTOCHECKBOX
EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY
@ -3596,7 +3593,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT
SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "256 Farver", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
@ -3621,7 +3618,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT
SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "256 colors", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
@ -3646,7 +3643,7 @@ FONT 8, "MS Sans Serif", 0, 0, 1
{
COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT
SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE
SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE
COMBOBOX IDC_MEM_SELECT, 4, 50, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN
AUTORADIOBUTTON "Bitmap", IDC_BITMAP, 4, 68, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON
AUTORADIOBUTTON "256 couleurs", IDC_256COUL, 4, 80, 55, 10, WS_TABSTOP | BS_AUTORADIOBUTTON
@ -3679,6 +3676,19 @@ FONT 8, "Ms Shell Dlg"
//
// String Table resources
//
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE
{
IDM_FILE_RECORDAVI "Record AVI"
IDM_FILE_STOPAVI "Stop AVI"
}
//
// Accelerator resources
//