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

cleanup to sdl movie recording; still segfaults on record

This commit is contained in:
punkrockguy318 2008-08-02 16:57:05 +00:00
parent c3b547c2bd
commit 9c784d3496
2 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/drivers/sdl/input.cpp
View File

@ -142,27 +142,6 @@ _keyonly(int a)
static int g_fkbEnabled = 0; static int g_fkbEnabled = 0;
int movie_slot = 0;
/*
* This function creates a filename to save/load a movie
* depending on the selected movie_slot (shift + x) where x is a
* number from 0 to 9
*/
char* GetMovieFilename(void)
{
char* fname = g_config->getConfigDirectory();
char fnum[2];
//TODO: The rom name should be prepended to the begining of the filename
strcat(fname, "/movie/");
sprintf(fnum, "%d", movie_slot);
strcat(fname, fnum);
strcat(fname, ".fm2");
return fname;
}
/** /**
* Parse keyboard commands and execute accordingly. * Parse keyboard commands and execute accordingly.
@ -239,9 +218,8 @@ KeyboardCommands()
g_config->getOption("SDL.Hotkeys.SaveState", &key); g_config->getOption("SDL.Hotkeys.SaveState", &key);
if(_keyonly(key)) { if(_keyonly(key)) {
if(is_shift) { if(is_shift) {
char* fname = GetMovieFilename(); FCEUI_printf("Recording movie to %s\n", curMovieFilename);
FCEUI_printf("Recording movie to %s\n", fname); FCEUI_SaveMovie(curMovieFilename, MOVIE_FLAG_NONE);
FCEUI_SaveMovie(fname, MOVIE_FLAG_NONE);
} else { } else {
FCEUI_SaveState(NULL); FCEUI_SaveState(NULL);
} }
@ -251,9 +229,8 @@ KeyboardCommands()
// f7 to load state, Shift-f7 to load movie // f7 to load state, Shift-f7 to load movie
if(_keyonly(key)) { if(_keyonly(key)) {
if(is_shift) { if(is_shift) {
char* fname = GetMovieFilename(); FCEUI_printf("Playing back movie located at %s\n", curMovieFilename);
FCEUI_printf("Playing back movie located at %s\n", fname); FCEUI_LoadMovie(curMovieFilename , false, false, false);
FCEUI_LoadMovie(fname , false, false, false);
} else { } else {
FCEUI_LoadState(NULL); FCEUI_LoadState(NULL);
} }
@ -357,12 +334,8 @@ do { \
} \ } \
FCEUI_DispMessage("Barcode: %s", bbuf); \ FCEUI_DispMessage("Barcode: %s", bbuf); \
} else { \ } else { \
if(is_shift) { \ FCEUI_SelectState(x,1); \
movie_slot = x; \
} else { \
FCEUI_SelectState(x,1); \
} \ } \
} \
} while(0) } while(0)
DIPSless: DIPSless:

1
src/movie.h
View File

@ -225,6 +225,7 @@ private:
extern MovieData currMovieData; extern MovieData currMovieData;
extern int currFrameCounter; extern int currFrameCounter;
extern char curMovieFilename[512];
//--------- //---------
void FCEUI_SaveMovie(char *fname, EMOVIE_FLAG flags); void FCEUI_SaveMovie(char *fname, EMOVIE_FLAG flags);