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

Stop movie hotkey hooked up, Play & Record movie hooked up but commented out because of a bug that causes the dialogs to open twice.

This commit is contained in:
adelikat 2009-05-15 13:10:33 +00:00
parent 229055cb0e
commit 4fa564f062
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
desmume/src/movie.cpp
View File

@ -372,9 +372,6 @@ static void StopRecording()
void FCEUI_StopMovie() void FCEUI_StopMovie()
{ {
//if(suppressMovieStop)
// return;
if(movieMode == MOVIEMODE_PLAY) if(movieMode == MOVIEMODE_PLAY)
StopPlayback(); StopPlayback();
else if(movieMode == MOVIEMODE_RECORD) else if(movieMode == MOVIEMODE_RECORD)

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

@ -30,6 +30,7 @@
#include "../movie.h" #include "../movie.h"
#include "ramwatch.h" //In order to call UpdateRamWatch (for loadstate functions) #include "ramwatch.h" //In order to call UpdateRamWatch (for loadstate functions)
#include "ram_search.h" //In order to call UpdateRamSearch (for loadstate functions) #include "ram_search.h" //In order to call UpdateRamSearch (for loadstate functions)
#include "replay.h"
extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function extern LRESULT OpenFile(); //adelikat: Made this an extern here instead of main.h Seemed icky not to limit the scope of this function
@ -181,13 +182,29 @@ void HK_ToggleReadOnly(int) {
SetMessageToDisplay("Read+Write"); SetMessageToDisplay("Read+Write");
} }
void HK_PlayMovie(int) { void HK_PlayMovie(int)
{
if (romloaded)
{
//NDS_Pause();
//Replay_LoadMovie();
//NDS_UnPause();
}
} }
void HK_RecordMovie(int) { void HK_RecordMovie(int)
{
if (romloaded)
{
//NDS_Pause();
//MovieRecordTo();
//NDS_UnPause();
}
} }
void HK_StopMovie(int) { void HK_StopMovie(int)
{
FCEUI_StopMovie();
} }
void HK_AutoHoldKeyDown(int) {AutoHoldPressed = true;} void HK_AutoHoldKeyDown(int) {AutoHoldPressed = true;}