Some code clean up
This commit is contained in:
parent
c7716b31ff
commit
d97699e058
|
@ -27,32 +27,41 @@
|
||||||
#include "help.h"
|
#include "help.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "main.h"
|
#include "main.h"
|
||||||
const int NUMWATCHES = 24;
|
|
||||||
const int LABELLENGTH = 64;
|
|
||||||
const int ADDRESSLENGTH = 16;
|
|
||||||
|
|
||||||
int MemWatch_wndx=0, MemWatch_wndy=0;
|
using namespace std;
|
||||||
static HDC hdc;
|
|
||||||
HWND hwndMemWatch=0;
|
|
||||||
static char addresses[NUMWATCHES][ADDRESSLENGTH];
|
|
||||||
static char labels[NUMWATCHES][LABELLENGTH];
|
|
||||||
static int NeedsInit = 1;
|
|
||||||
char *MemWatchDir = 0;
|
|
||||||
char memwLastFilename[2048];
|
|
||||||
bool fileChanged = false;
|
|
||||||
bool MemWatchLoadOnStart = false;
|
|
||||||
bool MemWatchLoadFileOnStart = false;
|
|
||||||
static HMENU memwmenu = 0;
|
|
||||||
std::string memwhelp = "{01ABA5FD-D54A-44EF-961A-42C7AA586D95}"; //Name of memory watch chapter in .chm (sure would be nice to get better names for these!"
|
|
||||||
|
|
||||||
|
//Memory Watch GUI Handles & Globals---------------------------
|
||||||
|
HWND hwndMemWatch=0; //Handle to Memwatch Window
|
||||||
|
static HDC hdc; //Handle to to Device Context
|
||||||
|
static HMENU memwmenu = 0; //Handle to Memwatch Menu
|
||||||
|
static HMENU memwrecentmenu;//Handle to Recent Files Menu
|
||||||
|
|
||||||
|
int MemWatch_wndx=0, MemWatch_wndy=0; //Window Position
|
||||||
|
|
||||||
|
//Memory Watch globals-----------------------------------------
|
||||||
|
const int NUMWATCHES = 24; //Maximum Number of Watches
|
||||||
|
const int LABELLENGTH = 64; //Maximum Length of a Watch label
|
||||||
|
const int ADDRESSLENGTH = 16; //Maximum Length of a Ram Address
|
||||||
|
|
||||||
|
static char addresses[NUMWATCHES][ADDRESSLENGTH]; //Stores all address labels
|
||||||
|
static char labels[NUMWATCHES][LABELLENGTH]; //Stores all label lengths
|
||||||
|
static int NeedsInit = 1; //Determines if Memwatch has been initialized (used so you don't lose data if you close memwatch)
|
||||||
|
char *MemWatchDir = 0; //Last directory used by memwatch
|
||||||
|
char memwLastFilename[2048]; //Last watch file used by memwatch
|
||||||
|
bool fileChanged = false; //Determines if Save Changes should appear
|
||||||
|
bool MemWatchLoadOnStart = false; //Load on Start Flag
|
||||||
|
bool MemWatchLoadFileOnStart = false; //Load last file Flag
|
||||||
|
|
||||||
|
string memwhelp = "{01ABA5FD-D54A-44EF-961A-42C7AA586D95}"; //Name of memory watch chapter in .chm (sure would be nice to get better names for these!"
|
||||||
|
|
||||||
|
//Recent Files Menu globals------------------------------------
|
||||||
char *memw_recent_files[] = { 0 ,0 ,0 ,0 ,0 };
|
char *memw_recent_files[] = { 0 ,0 ,0 ,0 ,0 };
|
||||||
|
|
||||||
const unsigned int MEMW_MENU_FIRST_RECENT_FILE = 600;
|
const unsigned int MEMW_MENU_FIRST_RECENT_FILE = 600;
|
||||||
const unsigned int MEMW_MAX_NUMBER_OF_RECENT_FILES = sizeof(memw_recent_files)/sizeof(*memw_recent_files);
|
const unsigned int MEMW_MAX_NUMBER_OF_RECENT_FILES = sizeof(memw_recent_files)/sizeof(*memw_recent_files);
|
||||||
|
|
||||||
static HMENU memwrecentmenu;
|
|
||||||
|
|
||||||
//Ram change monitor globals------------------------
|
|
||||||
|
//Ram change monitor globals-----------------------------------
|
||||||
bool RamChangeInitialize = false; //Set true during memw WM_INIT
|
bool RamChangeInitialize = false; //Set true during memw WM_INIT
|
||||||
const int MAX_RAMMONITOR = 4; //Maximum number of Ram values that can be monitored
|
const int MAX_RAMMONITOR = 4; //Maximum number of Ram values that can be monitored
|
||||||
char editboxnow[MAX_RAMMONITOR][5]; //current address put into editbox 00
|
char editboxnow[MAX_RAMMONITOR][5]; //current address put into editbox 00
|
||||||
|
@ -118,8 +127,7 @@ void UpdateMemw_RMenu(HMENU menu, char **strs, unsigned int mitem, unsigned int
|
||||||
DrawMenuBar(hAppWnd);
|
DrawMenuBar(hAppWnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Updates the Recent Files array
|
||||||
|
|
||||||
void UpdateMemwRecentArray(const char* addString, char** bufferArray, unsigned int arrayLen, HMENU menu, unsigned int menuItem, unsigned int baseId)
|
void UpdateMemwRecentArray(const char* addString, char** bufferArray, unsigned int arrayLen, HMENU menu, unsigned int menuItem, unsigned int baseId)
|
||||||
{
|
{
|
||||||
// Try to find out if the filename is already in the recent files list.
|
// Try to find out if the filename is already in the recent files list.
|
||||||
|
@ -171,18 +179,14 @@ void UpdateMemwRecentArray(const char* addString, char** bufferArray, unsigned i
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add the new item.
|
// Add the new item.
|
||||||
bufferArray[0] = (char*)malloc(strlen(addString) + 1); //mbg merge 7/17/06 added cast
|
bufferArray[0] = (char*)malloc(strlen(addString) + 1);
|
||||||
strcpy(bufferArray[0], addString);
|
strcpy(bufferArray[0], addString);
|
||||||
|
|
||||||
// Update the recent files menu
|
// Update the recent files menu
|
||||||
UpdateMemw_RMenu(menu, bufferArray, menuItem, baseId);
|
UpdateMemw_RMenu(menu, bufferArray, menuItem, baseId);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
//Add a filename to the recent files list.
|
||||||
* Add a filename to the recent files list.
|
|
||||||
*
|
|
||||||
* @param filename Name of the file to add.
|
|
||||||
**/
|
|
||||||
void MemwAddRecentFile(const char *filename)
|
void MemwAddRecentFile(const char *filename)
|
||||||
{
|
{
|
||||||
UpdateMemwRecentArray(filename, memw_recent_files, MEMW_MAX_NUMBER_OF_RECENT_FILES, memwrecentmenu, ID_FILE_RECENT, MEMW_MENU_FIRST_RECENT_FILE);
|
UpdateMemwRecentArray(filename, memw_recent_files, MEMW_MAX_NUMBER_OF_RECENT_FILES, memwrecentmenu, ID_FILE_RECENT, MEMW_MENU_FIRST_RECENT_FILE);
|
||||||
|
@ -347,10 +351,9 @@ static void PutInSpaces(int i)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Decides if any edit box has anything
|
||||||
bool iftextchanged()
|
bool iftextchanged()
|
||||||
{
|
{
|
||||||
//Decides if any edit box has anything
|
|
||||||
int i,j;
|
int i,j;
|
||||||
for(i=0;i<NUMWATCHES;i++)
|
for(i=0;i<NUMWATCHES;i++)
|
||||||
{
|
{
|
||||||
|
@ -365,10 +368,10 @@ bool iftextchanged()
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Saves all the addresses and labels to disk
|
//Save as...
|
||||||
static void SaveMemWatch()
|
static void SaveMemWatch()
|
||||||
{
|
{
|
||||||
const char filter[]="Memory address list(*.txt)\0*.txt\0";
|
const char filter[]="Memory address list(*.txt)\0*.txt\0";
|
||||||
|
@ -385,7 +388,7 @@ static void SaveMemWatch()
|
||||||
ofn.lpstrFile=nameo;
|
ofn.lpstrFile=nameo;
|
||||||
ofn.nMaxFile=256;
|
ofn.nMaxFile=256;
|
||||||
ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT;
|
ofn.Flags=OFN_EXPLORER|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT;
|
||||||
std::string initdir = FCEU_GetPath(FCEUMKF_MEMW);
|
string initdir = FCEU_GetPath(FCEUMKF_MEMW);
|
||||||
ofn.lpstrInitialDir=initdir.c_str();
|
ofn.lpstrInitialDir=initdir.c_str();
|
||||||
if(GetSaveFileName(&ofn))
|
if(GetSaveFileName(&ofn))
|
||||||
{
|
{
|
||||||
|
@ -478,7 +481,7 @@ static void QuickSaveMemWatch() //Save rather than Save as
|
||||||
SaveMemWatch();
|
SaveMemWatch();
|
||||||
}
|
}
|
||||||
|
|
||||||
//Loads a previously saved file
|
//Open Memwatch File
|
||||||
static void LoadMemWatch()
|
static void LoadMemWatch()
|
||||||
{
|
{
|
||||||
const char filter[]="Memory address list(*.txt)\0*.txt\0";
|
const char filter[]="Memory address list(*.txt)\0*.txt\0";
|
||||||
|
@ -501,7 +504,7 @@ static void LoadMemWatch()
|
||||||
ofn.lpstrFile=memwLastFilename;
|
ofn.lpstrFile=memwLastFilename;
|
||||||
ofn.nMaxFile=256;
|
ofn.nMaxFile=256;
|
||||||
ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
|
ofn.Flags=OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY;
|
||||||
std::string initdir = FCEU_GetPath(FCEUMKF_MEMW);
|
string initdir = FCEU_GetPath(FCEUMKF_MEMW);
|
||||||
ofn.lpstrInitialDir=initdir.c_str();
|
ofn.lpstrInitialDir=initdir.c_str();
|
||||||
|
|
||||||
if(GetOpenFileName(&ofn))
|
if(GetOpenFileName(&ofn))
|
||||||
|
@ -625,7 +628,7 @@ void CloseMemoryWatch()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//New File
|
||||||
void ClearAllText()
|
void ClearAllText()
|
||||||
{
|
{
|
||||||
if (fileChanged==true) //If contents have changed
|
if (fileChanged==true) //If contents have changed
|
||||||
|
@ -657,7 +660,7 @@ fileChanged = false;
|
||||||
static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
static BOOL CALLBACK MemWatchCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||||
{
|
{
|
||||||
const int FMAX = 6;
|
const int FMAX = 6;
|
||||||
std::string formula[FMAX] = {"> than", "> by 1", "< than", "< by 1", "equal", "!equal"};
|
string formula[FMAX] = {"> than", "> by 1", "< than", "< by 1", "equal", "!equal"};
|
||||||
|
|
||||||
const int kLabelControls[] = {MW_ValueLabel1,MW_ValueLabel2};
|
const int kLabelControls[] = {MW_ValueLabel1,MW_ValueLabel2};
|
||||||
|
|
||||||
|
|
|
@ -468,13 +468,13 @@ void FCEUI_SetInputFourscore(bool attachFourscore)
|
||||||
//mbg 6/18/08 HACK
|
//mbg 6/18/08 HACK
|
||||||
extern ZAPPER ZD[2];
|
extern ZAPPER ZD[2];
|
||||||
SFORMAT FCEUCTRL_STATEINFO[]={
|
SFORMAT FCEUCTRL_STATEINFO[]={
|
||||||
{ joy_readbit, 2, "JYRB"},
|
{ joy_readbit, 2, "JYRB"},
|
||||||
{ joy, 4, "JOYS"},
|
{ joy, 4, "JOYS"},
|
||||||
{ &LastStrobe, 1, "LSTS"},
|
{ &LastStrobe, 1, "LSTS"},
|
||||||
{ &ZD[0].bogo, 1, "ZBG0"},
|
{ &ZD[0].bogo, 1, "ZBG0"},
|
||||||
{ &ZD[1].bogo, 1, "ZBG1"},
|
{ &ZD[1].bogo, 1, "ZBG1"},
|
||||||
{ &lagFlag, 1, "LAGF"},
|
{ &lagFlag, 1, "LAGF"},
|
||||||
{ &lagCounter, 4, "LAGC"},
|
{ &lagCounter, 4, "LAGC"},
|
||||||
{ 0 }
|
{ 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -484,17 +484,15 @@ void FCEU_DoSimpleCommand(int cmd)
|
||||||
{
|
{
|
||||||
case FCEUNPCMD_FDSINSERT: FCEU_FDSInsert();break;
|
case FCEUNPCMD_FDSINSERT: FCEU_FDSInsert();break;
|
||||||
case FCEUNPCMD_FDSSELECT: FCEU_FDSSelect();break;
|
case FCEUNPCMD_FDSSELECT: FCEU_FDSSelect();break;
|
||||||
// case FCEUNPCMD_FDSEJECT: FCEU_FDSEject();break;
|
|
||||||
case FCEUNPCMD_VSUNICOIN: FCEU_VSUniCoin(); break;
|
case FCEUNPCMD_VSUNICOIN: FCEU_VSUniCoin(); break;
|
||||||
case FCEUNPCMD_VSUNIDIP0: //mbg merge 7/17/06 removed case range syntax
|
case FCEUNPCMD_VSUNIDIP0:
|
||||||
case FCEUNPCMD_VSUNIDIP0+1:
|
case FCEUNPCMD_VSUNIDIP0+1:
|
||||||
case FCEUNPCMD_VSUNIDIP0+2:
|
case FCEUNPCMD_VSUNIDIP0+2:
|
||||||
case FCEUNPCMD_VSUNIDIP0+3:
|
case FCEUNPCMD_VSUNIDIP0+3:
|
||||||
case FCEUNPCMD_VSUNIDIP0+4:
|
case FCEUNPCMD_VSUNIDIP0+4:
|
||||||
case FCEUNPCMD_VSUNIDIP0+5:
|
case FCEUNPCMD_VSUNIDIP0+5:
|
||||||
case FCEUNPCMD_VSUNIDIP0+6:
|
case FCEUNPCMD_VSUNIDIP0+6:
|
||||||
case FCEUNPCMD_VSUNIDIP0+7:
|
case FCEUNPCMD_VSUNIDIP0+7: FCEU_VSUniToggleDIP(cmd - FCEUNPCMD_VSUNIDIP0);break;
|
||||||
FCEU_VSUniToggleDIP(cmd - FCEUNPCMD_VSUNIDIP0);break;
|
|
||||||
case FCEUNPCMD_POWER: PowerNES();break;
|
case FCEUNPCMD_POWER: PowerNES();break;
|
||||||
case FCEUNPCMD_RESET: ResetNES();break;
|
case FCEUNPCMD_RESET: ResetNES();break;
|
||||||
}
|
}
|
||||||
|
@ -517,20 +515,12 @@ void FCEUI_FDSSelect(void)
|
||||||
FCEU_QSimpleCommand(FCEUNPCMD_FDSSELECT);
|
FCEU_QSimpleCommand(FCEUNPCMD_FDSSELECT);
|
||||||
}
|
}
|
||||||
|
|
||||||
//mbg merge 7/17/06 changed to void fn(void) to make it an EMUCMDFN
|
|
||||||
void FCEUI_FDSInsert(void)
|
void FCEUI_FDSInsert(void)
|
||||||
{
|
{
|
||||||
FCEU_QSimpleCommand(FCEUNPCMD_FDSINSERT);
|
FCEU_QSimpleCommand(FCEUNPCMD_FDSINSERT);
|
||||||
//return(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
int FCEUI_FDSEject(void)
|
|
||||||
{
|
|
||||||
FCEU_QSimpleCommand(FCEUNPCMD_FDSEJECT);
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
void FCEUI_VSUniToggleDIP(int w)
|
void FCEUI_VSUniToggleDIP(int w)
|
||||||
{
|
{
|
||||||
FCEU_QSimpleCommand(FCEUNPCMD_VSUNIDIP0 + w);
|
FCEU_QSimpleCommand(FCEUNPCMD_VSUNIDIP0 + w);
|
||||||
|
@ -586,9 +576,6 @@ static void CommandStateLoad(void);
|
||||||
static void CommandStateSave(void);
|
static void CommandStateSave(void);
|
||||||
static void CommandSelectSaveSlot(void);
|
static void CommandSelectSaveSlot(void);
|
||||||
static void CommandEmulationSpeed(void);
|
static void CommandEmulationSpeed(void);
|
||||||
// static void CommandMovieSelectSlot(void);
|
|
||||||
//static void CommandMovieRecord(void);
|
|
||||||
//static void CommandMovieReplay(void);
|
|
||||||
static void CommandSoundAdjust(void);
|
static void CommandSoundAdjust(void);
|
||||||
static void CommandUsePreset(void);
|
static void CommandUsePreset(void);
|
||||||
static void BackgroundDisplayToggle(void);
|
static void BackgroundDisplayToggle(void);
|
||||||
|
@ -607,11 +594,11 @@ static void CloseRom(void);
|
||||||
|
|
||||||
struct EMUCMDTABLE FCEUI_CommandTable[]=
|
struct EMUCMDTABLE FCEUI_CommandTable[]=
|
||||||
{
|
{
|
||||||
{ EMUCMD_POWER, EMUCMDTYPE_MISC, FCEUI_PowerNES, 0, 0, "Power", 0 },
|
{ EMUCMD_POWER, EMUCMDTYPE_MISC, FCEUI_PowerNES, 0, 0, "Power", 0 },
|
||||||
{ EMUCMD_RESET, EMUCMDTYPE_MISC, FCEUI_ResetNES, 0, 0, "Reset", 0 },
|
{ EMUCMD_RESET, EMUCMDTYPE_MISC, FCEUI_ResetNES, 0, 0, "Reset", 0 },
|
||||||
{ EMUCMD_PAUSE, EMUCMDTYPE_MISC, FCEUI_ToggleEmulationPause, 0, 0, "Pause", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_PAUSE, EMUCMDTYPE_MISC, FCEUI_ToggleEmulationPause, 0, 0, "Pause", EMUCMDFLAG_TASEDIT },
|
||||||
{ EMUCMD_FRAME_ADVANCE, EMUCMDTYPE_MISC, FCEUI_FrameAdvance, FCEUI_FrameAdvanceEnd, 0, "Frame Advance", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_FRAME_ADVANCE, EMUCMDTYPE_MISC, FCEUI_FrameAdvance, FCEUI_FrameAdvanceEnd, 0, "Frame Advance", EMUCMDFLAG_TASEDIT },
|
||||||
{ EMUCMD_SCREENSHOT, EMUCMDTYPE_MISC, FCEUI_SaveSnapshot, 0, 0, "Screenshot", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_SCREENSHOT, EMUCMDTYPE_MISC, FCEUI_SaveSnapshot, 0, 0, "Screenshot", EMUCMDFLAG_TASEDIT },
|
||||||
{ EMUCMD_HIDE_MENU_TOGGLE, EMUCMDTYPE_MISC, FCEUD_HideMenuToggle, 0, 0, "Hide Menu Toggle", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_HIDE_MENU_TOGGLE, EMUCMDTYPE_MISC, FCEUD_HideMenuToggle, 0, 0, "Hide Menu Toggle", EMUCMDFLAG_TASEDIT },
|
||||||
|
|
||||||
{ EMUCMD_SPEED_SLOWEST, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Slowest Speed", 0 },
|
{ EMUCMD_SPEED_SLOWEST, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Slowest Speed", 0 },
|
||||||
|
@ -620,7 +607,7 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
|
||||||
{ EMUCMD_SPEED_FASTER, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Speed Up", 0 },
|
{ EMUCMD_SPEED_FASTER, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Speed Up", 0 },
|
||||||
{ EMUCMD_SPEED_FASTEST, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Fastest Speed", 0 },
|
{ EMUCMD_SPEED_FASTEST, EMUCMDTYPE_SPEED, CommandEmulationSpeed, 0, 0, "Fastest Speed", 0 },
|
||||||
{ EMUCMD_SPEED_TURBO, EMUCMDTYPE_SPEED, FCEUD_TurboOn, FCEUD_TurboOff, 0, "Turbo", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_SPEED_TURBO, EMUCMDTYPE_SPEED, FCEUD_TurboOn, FCEUD_TurboOff, 0, "Turbo", EMUCMDFLAG_TASEDIT },
|
||||||
{ EMUCMD_SPEED_TURBO_TOGGLE, EMUCMDTYPE_SPEED, FCEUD_TurboToggle, 0, 0, "Turbo Toggle", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_SPEED_TURBO_TOGGLE, EMUCMDTYPE_SPEED, FCEUD_TurboToggle, 0, 0, "Turbo Toggle", EMUCMDFLAG_TASEDIT },
|
||||||
|
|
||||||
{ EMUCMD_SAVE_SLOT_0, EMUCMDTYPE_STATE, CommandSelectSaveSlot, 0, 0, "Savestate Slot 0", 0 },
|
{ EMUCMD_SAVE_SLOT_0, EMUCMDTYPE_STATE, CommandSelectSaveSlot, 0, 0, "Savestate Slot 0", 0 },
|
||||||
{ EMUCMD_SAVE_SLOT_1, EMUCMDTYPE_STATE, CommandSelectSaveSlot, 0, 0, "Savestate Slot 1", 0 },
|
{ EMUCMD_SAVE_SLOT_1, EMUCMDTYPE_STATE, CommandSelectSaveSlot, 0, 0, "Savestate Slot 1", 0 },
|
||||||
|
@ -659,47 +646,13 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
|
||||||
{ EMUCMD_LOAD_STATE_SLOT_8, EMUCMDTYPE_STATE, CommandStateLoad, 0, 0, "Load State from Slot 8", 0 },
|
{ EMUCMD_LOAD_STATE_SLOT_8, EMUCMDTYPE_STATE, CommandStateLoad, 0, 0, "Load State from Slot 8", 0 },
|
||||||
{ EMUCMD_LOAD_STATE_SLOT_9, EMUCMDTYPE_STATE, CommandStateLoad, 0, 0, "Load State from Slot 9", 0 },
|
{ EMUCMD_LOAD_STATE_SLOT_9, EMUCMDTYPE_STATE, CommandStateLoad, 0, 0, "Load State from Slot 9", 0 },
|
||||||
|
|
||||||
/* { EMUCMD_MOVIE_SLOT_0, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 0", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_1, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 1", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_2, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 2", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_3, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 3", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_4, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 4", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_5, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 5", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_6, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 6", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_7, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 7", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_8, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 8", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_9, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Movie Slot 9", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_NEXT, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Next Movie Slot", 0 },
|
|
||||||
{ EMUCMD_MOVIE_SLOT_PREV, EMUCMDTYPE_MOVIE, CommandMovieSelectSlot, 0, 0, "Previous Movie Slot", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie", 0 },*/
|
|
||||||
{ EMUCMD_MOVIE_RECORD_TO, EMUCMDTYPE_MOVIE, FCEUD_MovieRecordTo, 0, 0, "Record Movie To...",0 },
|
{ EMUCMD_MOVIE_RECORD_TO, EMUCMDTYPE_MOVIE, FCEUD_MovieRecordTo, 0, 0, "Record Movie To...",0 },
|
||||||
/* { EMUCMD_MOVIE_RECORD_SLOT_0, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 0", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_1, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 1",0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_2, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 2", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_3, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 3", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_4, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 4", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_5, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 5", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_6, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 6", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_7, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 7", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_8, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 8", 0 },
|
|
||||||
{ EMUCMD_MOVIE_RECORD_SLOT_9, EMUCMDTYPE_MOVIE, CommandMovieRecord, 0, 0, "Record Movie to Slot 9", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie", },*/
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_FROM, EMUCMDTYPE_MOVIE, FCEUD_MovieReplayFrom, 0, 0, "Replay Movie From...", },
|
{ EMUCMD_MOVIE_REPLAY_FROM, EMUCMDTYPE_MOVIE, FCEUD_MovieReplayFrom, 0, 0, "Replay Movie From...", },
|
||||||
/* { EMUCMD_MOVIE_REPLAY_SLOT_0, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 0", 0 },
|
{ EMUCMD_MOVIE_PLAY_FROM_BEGINNING, EMUCMDTYPE_MOVIE, FCEUI_MoviePlayFromBeginning, 0, 0, "Play Movie From Beginning", 0 },
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_1, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 1", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_2, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 2", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_3, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 3", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_4, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 4", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_5, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 5", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_6, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 6", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_7, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 7", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_8, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 8", 0 },
|
|
||||||
{ EMUCMD_MOVIE_REPLAY_SLOT_9, EMUCMDTYPE_MOVIE, CommandMovieReplay, 0, 0, "Replay Movie from Slot 9", 0 },
|
|
||||||
*/
|
|
||||||
{ EMUCMD_MOVIE_PLAY_FROM_BEGINNING, EMUCMDTYPE_MOVIE, FCEUI_MoviePlayFromBeginning, 0, 0, "Play Movie From Beginning", 0 },
|
|
||||||
{ EMUCMD_MOVIE_STOP, EMUCMDTYPE_MOVIE, FCEUI_StopMovie, 0, 0, "Stop Movie", 0 },
|
{ EMUCMD_MOVIE_STOP, EMUCMDTYPE_MOVIE, FCEUI_StopMovie, 0, 0, "Stop Movie", 0 },
|
||||||
{ EMUCMD_MOVIE_READONLY_TOGGLE, EMUCMDTYPE_MOVIE, FCEUI_MovieToggleReadOnly, 0, 0, "Toggle Read-Only", EMUCMDFLAG_TASEDIT },
|
{ EMUCMD_MOVIE_READONLY_TOGGLE, EMUCMDTYPE_MOVIE, FCEUI_MovieToggleReadOnly, 0, 0, "Toggle Read-Only", EMUCMDFLAG_TASEDIT },
|
||||||
{ EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE, EMUCMDTYPE_MOVIE, FCEUI_MovieToggleFrameDisplay, 0, 0, "Movie Frame Display Toggle", 0 },
|
{ EMUCMD_MOVIE_FRAME_DISPLAY_TOGGLE, EMUCMDTYPE_MOVIE, FCEUI_MovieToggleFrameDisplay, 0, 0, "Movie Frame Display Toggle", 0 },
|
||||||
|
|
||||||
{ EMUCMD_MOVIE_INPUT_DISPLAY_TOGGLE, EMUCMDTYPE_MISC, FCEUI_ToggleInputDisplay, 0, 0, "Toggle Input Display", 0 },
|
{ EMUCMD_MOVIE_INPUT_DISPLAY_TOGGLE, EMUCMDTYPE_MISC, FCEUI_ToggleInputDisplay, 0, 0, "Toggle Input Display", 0 },
|
||||||
{ EMUCMD_MOVIE_ICON_DISPLAY_TOGGLE, EMUCMDTYPE_MISC, FCEUD_ToggleStatusIcon, 0, 0, "Toggle Status Icon", 0 },
|
{ EMUCMD_MOVIE_ICON_DISPLAY_TOGGLE, EMUCMDTYPE_MISC, FCEUD_ToggleStatusIcon, 0, 0, "Toggle Status Icon", 0 },
|
||||||
|
|
||||||
|
@ -834,16 +787,6 @@ static void CommandStateLoad(void)
|
||||||
FCEUI_LoadState(0);
|
FCEUI_LoadState(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*static void CommandMovieRecord(void)
|
|
||||||
{
|
|
||||||
FCEUI_SaveMovie(0, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void CommandMovieReplay(void)
|
|
||||||
{
|
|
||||||
FCEUI_LoadMovie(0, 0, 0);
|
|
||||||
}*/
|
|
||||||
|
|
||||||
static void CommandSoundAdjust(void)
|
static void CommandSoundAdjust(void)
|
||||||
{
|
{
|
||||||
int n=0;
|
int n=0;
|
||||||
|
|
Loading…
Reference in New Issue