From f04f1bbe4492eb95c9caa6e4a203b152922d812f Mon Sep 17 00:00:00 2001 From: BearOso Date: Thu, 6 Aug 2020 16:45:09 -0500 Subject: [PATCH] Remove S9xChooseFilename This is integration of the frontend with the core. Disable the snapshot button mappings that use it. Any frontend should implement those port commands its own. --- controls.cpp | 2 -- display.h | 1 - docs/porting.html | 4 ---- gtk/src/gtk_file.cpp | 5 ----- libretro/libretro.cpp | 1 - macosx/mac-file.mm | 5 ----- unix/unix.cpp | 19 ------------------- win32/wsnes9x.cpp | 6 ------ 8 files changed, 43 deletions(-) diff --git a/controls.cpp b/controls.cpp index f7918155..08a1e651 100644 --- a/controls.cpp +++ b/controls.cpp @@ -2269,11 +2269,9 @@ void S9xApplyCommand (s9xcommand_t cmd, int16 data1, int16 data2) break; case LoadFreezeFile: - S9xUnfreezeGame(S9xChooseFilename(TRUE)); break; case SaveFreezeFile: - S9xFreezeGame(S9xChooseFilename(FALSE)); break; case LoadOopsFile: diff --git a/display.h b/display.h index 3e770709..a2f12670 100644 --- a/display.h +++ b/display.h @@ -47,7 +47,6 @@ const char * S9xStringInput (const char *); const char * S9xGetDirectory (enum s9x_getdirtype); const char * S9xGetFilename (const char *, enum s9x_getdirtype); const char * S9xGetFilenameInc (const char *, enum s9x_getdirtype); -const char * S9xChooseFilename (bool8); const char * S9xBasename (const char *); // Routines the port has to implement if it uses command-line diff --git a/docs/porting.html b/docs/porting.html index ac800c62..183ad4f3 100644 --- a/docs/porting.html +++ b/docs/porting.html @@ -298,10 +298,6 @@

Called when Snes9x wants to know the directory dirtype.

-

const char *S9xChooseFilename (bool8 read_only)

-

- If your port can match Snes9x's built-in LoadFreezeFile/SaveFreezeFile command (see controls.cpp), you may choose to use this function. Otherwise return NULL. -

const char *S9xChooseMovieFilename (bool8 read_only)

If your port can match Snes9x's built-in BeginRecordingMovie/LoadMovie command (see controls.cpp), you may choose to use this function. Otherwise return NULL. diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp index f627db21..dfc8c926 100644 --- a/gtk/src/gtk_file.cpp +++ b/gtk/src/gtk_file.cpp @@ -29,11 +29,6 @@ const char *S9xChooseMovieFilename(bool8 read_only) return path; } -const char *S9xChooseFilename(bool8 read_only) -{ - return ""; -} - const char *S9xGetFilenameInc(const char *e, enum s9x_getdirtype dirtype) { static char filename[PATH_MAX + 1]; diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 319bf9ab..f85fb293 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -2125,7 +2125,6 @@ const char* S9xGetDirectory(s9x_getdirtype type) return ""; } void S9xInitInputDevices() {} -const char* S9xChooseFilename(unsigned char) { return ""; } void S9xHandlePortCommand(s9xcommand_t, short, short) {} bool S9xPollButton(unsigned int, bool*) { return false; } void S9xToggleSoundChannel(int) {} diff --git a/macosx/mac-file.mm b/macosx/mac-file.mm index b9deca6b..1fa6a437 100644 --- a/macosx/mac-file.mm +++ b/macosx/mac-file.mm @@ -365,11 +365,6 @@ const char * S9xGetFilenameInc (const char *inExt, enum s9x_getdirtype dirtype) return (NULL); } -const char * S9xChooseFilename (bool8 read_only) -{ - return (NULL); -} - const char * S9xChooseMovieFilename (bool8 read_only) { return (NULL); diff --git a/unix/unix.cpp b/unix/unix.cpp index a4857d69..cc45c630 100644 --- a/unix/unix.cpp +++ b/unix/unix.cpp @@ -588,25 +588,6 @@ const char * S9xBasename (const char *f) return (f); } -const char * S9xChooseFilename (bool8 read_only) -{ - char s[PATH_MAX + 1]; - char drive[_MAX_DRIVE + 1], dir[_MAX_DIR + 1], fname[_MAX_FNAME + 1], ext[_MAX_EXT + 1]; - - const char *filename; - char title[64]; - - _splitpath(Memory.ROMFilename, drive, dir, fname, ext); - snprintf(s, PATH_MAX + 1, "%s.frz", fname); - sprintf(title, "%s snapshot filename", read_only ? "Select load" : "Choose save"); - - S9xSetSoundMute(TRUE); - filename = S9xSelectFilename(s, S9xGetDirectory(SNAPSHOT_DIR), "frz", title); - S9xSetSoundMute(FALSE); - - return (filename); -} - const char * S9xChooseMovieFilename (bool8 read_only) { char s[PATH_MAX + 1]; diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp index c84e093b..9ec60a00 100644 --- a/win32/wsnes9x.cpp +++ b/win32/wsnes9x.cpp @@ -10843,12 +10843,6 @@ void S9xHandlePortCommand(s9xcommand_t cmd, int16 data1, int16 data2) return; } -// NYI -const char *S9xChooseFilename (bool8 read_only) -{ - return NULL; -} - // NYI const char *S9xChooseMovieFilename (bool8 read_only) {