From e42d3d288f06a8ca3c955a9500f930e6c3b4c195 Mon Sep 17 00:00:00 2001 From: jeblanchard Date: Fri, 13 Jun 2008 02:03:55 +0000 Subject: [PATCH] Fix frame-count of 0 in replay dialog --- src/driver.h | 2 +- src/drivers/win/replay.cpp | 4 ++-- src/movie.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/driver.h b/src/driver.h index 7e74f41d..ff7326b7 100644 --- a/src/driver.h +++ b/src/driver.h @@ -188,7 +188,7 @@ void FCEUI_LoadMovie(char *fname, bool read_only, int _stopframe); void FCEUI_MoviePlayFromBeginning(void); void FCEUI_StopMovie(void); //int FCEUI_IsMovieActive(void); -bool FCEUI_MovieGetInfo(const char* fname, MOVIE_INFO* /* [in, out] */ info); +bool FCEUI_MovieGetInfo(const char* fname, MOVIE_INFO* /* [in, out] */ info, bool skipFrameCount = false); char* FCEUI_MovieGetCurrentName(int addSlotNumber); void FCEUI_MovieToggleReadOnly(void); bool FCEUI_GetMovieToggleReadOnly(); diff --git a/src/drivers/win/replay.cpp b/src/drivers/win/replay.cpp index d066d3fe..d355fade 100644 --- a/src/drivers/win/replay.cpp +++ b/src/drivers/win/replay.cpp @@ -112,7 +112,7 @@ void UpdateReplayDialog(HWND hwndDlg) memset(&info, 0, sizeof(info)); - if(FCEUI_MovieGetInfo(fn, &info)) + if(FCEUI_MovieGetInfo(fn, &info, false)) { char tmp[256]; uint32 div; @@ -328,7 +328,7 @@ BOOL CALLBACK ReplayDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP char* dot = strrchr(filename, '.'); - if(!FCEUI_MovieGetInfo(filename, &info)) + if(!FCEUI_MovieGetInfo(filename, &info, true)) continue; //------------ diff --git a/src/movie.cpp b/src/movie.cpp index eaae0eec..6b21450b 100644 --- a/src/movie.cpp +++ b/src/movie.cpp @@ -934,14 +934,14 @@ void FCEUI_MoviePlayFromBeginning(void) } -bool FCEUI_MovieGetInfo(const char* fname, MOVIE_INFO* info) +bool FCEUI_MovieGetInfo(const char* fname, MOVIE_INFO* info, bool skipFrameCount) { memset(info,0,sizeof(MOVIE_INFO)); MovieData md; std::fstream* fp = FCEUD_UTF8_fstream(fname, "rb"); if(!fp) return false; - LoadFM2(md, fp, true); + LoadFM2(md, fp, skipFrameCount); fp->close(); delete fp;