From b6525112fbbfe0de44dfb1b7ab598aa8adcbabaa Mon Sep 17 00:00:00 2001 From: gocha Date: Sat, 4 Aug 2012 08:33:19 +0900 Subject: [PATCH] Remove MovieNotifyIgnored setting Reasons, 1. Most players don't need it. It's probably only used by TASers. 2. However, as for TASers, it's less useful than lag frame count display. (i.e. how many frames have been ignored) --- movie.cpp | 4 ++-- snes9x.cpp | 1 - snes9x.h | 1 - win32/wconfig.cpp | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/movie.cpp b/movie.cpp index 582cb213..b8668e0d 100644 --- a/movie.cpp +++ b/movie.cpp @@ -1188,8 +1188,8 @@ void S9xUpdateFrameCounter (int offset) *GFX.FrameDisplayString = 0; else if (Movie.State == MOVIE_STATE_RECORD) - sprintf(GFX.FrameDisplayString, "Recording frame: %d%s", - max(0, (int) (Movie.CurrentFrame + offset)), pad_read || !Settings.MovieNotifyIgnored ? "" : " (ignored)"); + sprintf(GFX.FrameDisplayString, "Recording frame: %d", + max(0, (int) (Movie.CurrentFrame + offset))); else if (Movie.State == MOVIE_STATE_PLAY) sprintf(GFX.FrameDisplayString, "Playing frame: %d / %d", diff --git a/snes9x.cpp b/snes9x.cpp index 4a84e70b..3a554daf 100644 --- a/snes9x.cpp +++ b/snes9x.cpp @@ -425,7 +425,6 @@ void S9xLoadConfigFiles (char **argv, int argc) Settings.TurboMode = conf.GetBool("Settings::TurboMode", false); Settings.TurboSkipFrames = conf.GetUInt("Settings::TurboFrameSkip", 15); Settings.MovieTruncate = conf.GetBool("Settings::MovieTruncateAtEnd", false); - Settings.MovieNotifyIgnored = conf.GetBool("Settings::MovieNotifyIgnored", false); Settings.WrongMovieStateProtection = conf.GetBool("Settings::WrongMovieStateProtection", true); Settings.StretchScreenshots = conf.GetInt ("Settings::StretchScreenshots", 1); Settings.SnapshotScreenshots = conf.GetBool("Settings::SnapshotScreenshots", true); diff --git a/snes9x.h b/snes9x.h index 97689baf..aecbb9c1 100644 --- a/snes9x.h +++ b/snes9x.h @@ -432,7 +432,6 @@ struct SSettings int Port; bool8 MovieTruncate; - bool8 MovieNotifyIgnored; bool8 WrongMovieStateProtection; bool8 DumpStreams; int DumpStreamsMaxFrames; diff --git a/win32/wconfig.cpp b/win32/wconfig.cpp index 9d25c202..b847fd37 100644 --- a/win32/wconfig.cpp +++ b/win32/wconfig.cpp @@ -900,7 +900,6 @@ void WinRegisterConfigItems() AddBool("BlockInvalidVRAMAccess", Settings.BlockInvalidVRAMAccessMaster, true); AddBool2C("SnapshotScreenshots", Settings.SnapshotScreenshots, true, "on to save the screenshot in each snapshot, for loading-when-paused display"); AddBoolC("MovieTruncateAtEnd", Settings.MovieTruncate, true, "true to truncate any leftover data in the movie file after the current frame when recording stops"); - AddBoolC("MovieNotifyIgnored", Settings.MovieNotifyIgnored, false, "true to display \"(ignored)\" in the frame counter when recording when the last frame of input was not used by the SNES (such as lag or loading frames)"); AddBool("DisplayWatchedAddresses", Settings.DisplayWatchedAddresses, true); AddBool2C("WrongMovieStateProtection", Settings.WrongMovieStateProtection, true, "off to allow states to be loaded for recording from a different movie than they were made in"); AddUIntC("MessageDisplayTime", Settings.InitialInfoStringTimeout, 120, "display length of messages, in frames. set to 0 to disable all message text");