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

fix compile errors in movie.cpp

This commit is contained in:
zeromus 2009-05-02 17:57:06 +00:00
parent 4798e034f8
commit 0cc0e4739b
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/NDSSystem.cpp
View File

@ -845,7 +845,10 @@ int NDS_LoadROM( const char *filename, int bmtype, u32 bmsize,
return ret; return ret;
} }
void MovieSRAM(int bmtype, u32 bmsize) { void MovieSRAM()
{
int bmtype = MMU.bupmem.type;
u32 bmsize = MMU.bupmem.size;
char buf[MAX_PATH]; char buf[MAX_PATH];
@ -859,7 +862,6 @@ void MovieSRAM(int bmtype, u32 bmsize) {
mc_realloc(&MMU.bupmem, bmtype, bmsize); mc_realloc(&MMU.bupmem, bmtype, bmsize);
mc_load_file(&MMU.bupmem, buf); mc_load_file(&MMU.bupmem, buf);
} }
void NDS_FreeROM(void) void NDS_FreeROM(void)

3
desmume/src/NDSSystem.h
View File

@ -385,6 +385,7 @@ public:
virtual BOOL WIFI_Host_InitSystem() { return FALSE; } virtual BOOL WIFI_Host_InitSystem() { return FALSE; }
virtual void WIFI_Host_ShutdownSystem() {} virtual void WIFI_Host_ShutdownSystem() {}
virtual BOOL AVI_IsRecording() { return FALSE; } virtual BOOL AVI_IsRecording() { return FALSE; }
virtual void USR_InfoMessage(const char *message) { printf(message); }
}; };
extern Driver* driver; extern Driver* driver;
@ -392,7 +393,7 @@ extern std::string InputDisplayString;
extern int LagFrameFlag; extern int LagFrameFlag;
extern int lastLag, TotalLagFrames; extern int lastLag, TotalLagFrames;
void MovieSRAM(int bmtype, u32 bmsize); void MovieSRAM();
void ClearAutoHold(void); void ClearAutoHold(void);

15
desmume/src/movie.cpp
View File

@ -22,7 +22,6 @@
#include <assert.h> #include <assert.h>
#include <limits.h> #include <limits.h>
#include <fstream> #include <fstream>
#include "main.h"
#include "utils/guid.h" #include "utils/guid.h"
#include "utils/xstring.h" #include "utils/xstring.h"
#include "movie.h" #include "movie.h"
@ -355,7 +354,7 @@ static void closeRecordingMovie()
/// Stop movie playback. /// Stop movie playback.
static void StopPlayback() static void StopPlayback()
{ {
SetMessageToDisplay("Movie playback stopped."); driver->USR_InfoMessage("Movie playback stopped.");
movieMode = MOVIEMODE_INACTIVE; movieMode = MOVIEMODE_INACTIVE;
} }
@ -363,7 +362,7 @@ static void StopPlayback()
/// Stop movie recording /// Stop movie recording
static void StopRecording() static void StopRecording()
{ {
SetMessageToDisplay("Movie recording stopped."); driver->USR_InfoMessage("Movie recording stopped.");
movieMode = MOVIEMODE_INACTIVE; movieMode = MOVIEMODE_INACTIVE;
closeRecordingMovie(); closeRecordingMovie();
@ -436,14 +435,14 @@ void FCEUI_LoadMovie(const char *fname, bool _read_only, bool tasedit, int _paus
movieMode = MOVIEMODE_PLAY; movieMode = MOVIEMODE_PLAY;
currRerecordCount = currMovieData.rerecordCount; currRerecordCount = currMovieData.rerecordCount;
InitMovieTime(); InitMovieTime();
MovieSRAM(backupmemorytype, backupmemorysize); MovieSRAM();
freshMovie = true; freshMovie = true;
ClearAutoHold(); ClearAutoHold();
if(movie_readonly) if(movie_readonly)
SetMessageToDisplay("Replay started Read-Only."); driver->USR_InfoMessage("Replay started Read-Only.");
else else
SetMessageToDisplay("Replay started Read+Write."); driver->USR_InfoMessage("Replay started Read+Write.");
} }
static void openRecordingMovie(const char* fname) static void openRecordingMovie(const char* fname)
@ -492,9 +491,9 @@ static void openRecordingMovie(const char* fname)
movie_readonly = false; movie_readonly = false;
currRerecordCount = 0; currRerecordCount = 0;
InitMovieTime(); InitMovieTime();
MovieSRAM(backupmemorytype, backupmemorysize); MovieSRAM();
SetMessageToDisplay("Movie recording started."); driver->USR_InfoMessage("Movie recording started.");
} }
void NDS_setTouchFromMovie(void) { void NDS_setTouchFromMovie(void) {

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

@ -1527,6 +1527,11 @@ class WinDriver : public Driver
{ {
return ::AVI_IsRecording(); return ::AVI_IsRecording();
} }
virtual void USR_InfoMessage(const char *message)
{
SetMessageToDisplay(message);
}
}; };
int WINAPI WinMain (HINSTANCE hThisInstance, int WINAPI WinMain (HINSTANCE hThisInstance,