From 0f8a47467c666c0099227b687d022bce4d8af6c1 Mon Sep 17 00:00:00 2001 From: Themaister Date: Sat, 7 Apr 2012 12:20:37 +0200 Subject: [PATCH] Fixups. --- ssnes.c | 12 ++++++------ ssnes.cfg | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ssnes.c b/ssnes.c index 1c0f481285..755dcbcad0 100644 --- a/ssnes.c +++ b/ssnes.c @@ -1323,7 +1323,7 @@ static void deinit_netplay(void) } #endif -static void init_libsnes_cbs_plain(void) +static void init_libretro_cbs_plain(void) { pretro_set_video_refresh(video_frame); pretro_set_audio_sample(audio_sample); @@ -1332,7 +1332,7 @@ static void init_libsnes_cbs_plain(void) pretro_set_input_poll(input_poll); } -static void init_libsnes_cbs(void) +static void init_libretro_cbs(void) { #ifdef HAVE_NETPLAY if (g_extern.netplay) @@ -1350,9 +1350,9 @@ static void init_libsnes_cbs(void) : input_state_net); } else - init_libsnes_cbs_plain(); + init_libretro_cbs_plain(); #else - init_libsnes_cbs_plain(); + init_libretro_cbs_plain(); #endif } @@ -2333,7 +2333,7 @@ int ssnes_main_init(int argc, char *argv[]) #endif init_rewind(); - init_libsnes_cbs(); + init_libretro_cbs(); init_controllers(); #ifdef HAVE_FFMPEG @@ -2393,7 +2393,7 @@ bool ssnes_main_iterate(void) // Checks for stuff like fullscreen, save states, etc. do_state_checks(); - // Run libsnes for one frame. + // Run libretro for one frame. #ifndef SSNES_CONSOLE // On consoles pausing is handled better elsewhere. if (!g_extern.is_paused || g_extern.is_oneshot) #endif diff --git a/ssnes.cfg b/ssnes.cfg index f6a3fb99c6..472432ce83 100644 --- a/ssnes.cfg +++ b/ssnes.cfg @@ -8,8 +8,8 @@ # This will be overridden by explicit command line options. # savestate_directory = -# If enabled, load libsnes from a dynamic location. -# libsnes_path = "/path/to/libsnes.so" +# If enabled, load libretro from a dynamic location. +# libretro_path = "/path/to/libretro.so" # Environment variables internally in SSNES. # Implementations can tap into this user-specificed information to enable functionality