Libsnes exorcism

This commit is contained in:
Twinaphex 2012-07-07 17:08:55 +02:00
parent de6d88959f
commit 2fd12edfb6
11 changed files with 21 additions and 21 deletions

View File

@ -523,7 +523,7 @@ HRESULT CRetroArchMain::OnInit(XUIMessageInit * pInitData, BOOL& bHandled)
GetChildById(L"XuiBtnQuit", &m_quit);
GetChildById(L"XuiTxtTitle", &m_title);
GetChildById(L"XuiTxtCoreText", &m_core);
GetChildById(L"XuiBtnLibsnesCore", &m_change_libretro_core);
GetChildById(L"XuiBtnLibretroCore", &m_change_libretro_core);
char core_text[256];
snprintf(core_text, sizeof(core_text), "%s (v%s)", id, info.library_version);

View File

@ -43,7 +43,7 @@
<Height>30.799988</Height>
<Position>38.127960,196.615982,0.000000</Position>
<NavUp>XuiBtnControls</NavUp>
<NavDown>XuiBtnLibsnesCore</NavDown>
<NavDown>XuiBtnLibretroCore</NavDown>
<Text>Settings</Text>
</Properties>
</XuiButton>
@ -54,7 +54,7 @@
<Height>30.799988</Height>
<Position>38.327736,287.007996,0.000000</Position>
<Pivot>245.162109,-84.153275,0.000000</Pivot>
<NavUp>XuiBtnLibsnesCore</NavUp>
<NavUp>XuiBtnLibretroCore</NavUp>
<NavDown>XuiBtnRomBrowser</NavDown>
<Text>Quit</Text>
</Properties>
@ -103,7 +103,7 @@
</XuiButton>
<XuiButton>
<Properties>
<Id>XuiBtnLibsnesCore</Id>
<Id>XuiBtnLibretroCore</Id>
<Width>488.312012</Width>
<Height>30.799988</Height>
<Position>38.127960,241.615982,0.000000</Position>

View File

@ -43,7 +43,7 @@
<Height>30.799988</Height>
<Position>38.127960,196.615982,0.000000</Position>
<NavUp>XuiBtnControls</NavUp>
<NavDown>XuiBtnLibsnesCore</NavDown>
<NavDown>XuiBtnLibretroCore</NavDown>
<Text>Settings</Text>
</Properties>
</XuiButton>
@ -54,7 +54,7 @@
<Height>30.799988</Height>
<Position>38.327736,287.007996,0.000000</Position>
<Pivot>245.162109,-84.153275,0.000000</Pivot>
<NavUp>XuiBtnLibsnesCore</NavUp>
<NavUp>XuiBtnLibretroCore</NavUp>
<NavDown>XuiBtnRomBrowser</NavDown>
<Text>Quit</Text>
</Properties>
@ -103,7 +103,7 @@
</XuiButton>
<XuiButton>
<Properties>
<Id>XuiBtnLibsnesCore</Id>
<Id>XuiBtnLibretroCore</Id>
<Width>488.312012</Width>
<Height>30.799988</Height>
<Position>38.127960,241.615982,0.000000</Position>

View File

@ -129,6 +129,6 @@ enum xdk360_device_id
#endif
extern uint64_t rarch_default_keybind_lut[RARCH_FIRST_META_KEY];
extern char rarch_default_libsnes_keybind_name_lut[RARCH_FIRST_META_KEY][256];
extern char rarch_default_libretro_keybind_name_lut[RARCH_FIRST_META_KEY][256];
#endif

View File

@ -13,9 +13,9 @@
* If not, see <http://www.gnu.org/licenses/>.
*/
// Test module to check re-entrancy of libsnes implementations.
// Test module to check re-entrancy of libretro implementations.
// Reruns RetroArch main loop with all roms defined on command-line
// to check if libsnes can load multiple roms after each other.
// to check if libretro can load multiple roms after each other.
#include "../getopt_rarch.h"
#include "../general.h"

View File

@ -568,7 +568,7 @@ static bool get_info(netplay_t *handle)
if (implementation_magic_value() != ntohl(header[1]))
{
RARCH_ERR("Implementations differ, make sure you're using exact same libsnes implementations and RetroArch version.\n");
RARCH_ERR("Implementations differ, make sure you're using exact same libretro implementations and RetroArch version.\n");
return false;
}

View File

@ -142,7 +142,7 @@ video_font_size = 10
# Used to calculate a suitable audio input rate.
# video_refresh_rate = 59.95
# Allows libsnes cores to set rotation modes.
# Allows libretro cores to set rotation modes.
# Setting this to false will honor, but ignore this request.
# This is useful for vertically oriented games where one manually rotates the monitor.
# video_allow_rotate = true
@ -233,7 +233,7 @@ input_player1_down = down
# input_player3_joypad_index = 2
# input_player4_joypad_index = 3
# input_player5_joypad_index = 4
# Player 6-8 is not directly expected by libsnes API, but we'll futureproof it.
# Player 6-8 is not directly expected by libretro API, but we'll futureproof it.
# input_player6_joypad_index = 5
# input_player7_joypad_index = 6
# input_player8_joypad_index = 7
@ -338,7 +338,7 @@ input_player1_down = down
#### Misc
# Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
# Do note that rewinding will only work properly when using bSNES libsnes core atm.
# Do note that rewinding will only work properly when using bSNES libretro core atm.
# rewind_enable = false
# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.

View File

@ -22,7 +22,7 @@ if [ "$HAVE_RPI" = 'yes' ]; then
fi
if [ "$LIBRETRO" ]; then
echo "Explicit libsnes used, disabling dynamic libsnes loading ..."
echo "Explicit libretro used, disabling dynamic libretro loading ..."
HAVE_DYNAMIC='no'
else LIBRETRO="-lretro"
fi

View File

@ -1,4 +1,4 @@
HAVE_DYNAMIC=yes # Disable dynamic loading of libsnes library
HAVE_DYNAMIC=yes # Disable dynamic loading of libretro library
HAVE_LIBRETRO= # libretro library used
HAVE_THREADS=auto # Threading support
HAVE_FFMPEG=auto # Enable FFmpeg recording support

View File

@ -475,7 +475,7 @@ bool ffemu_push_video(ffemu_t *handle, const struct ffemu_video_data *data)
slock_lock(handle->lock);
// Tightly pack our frame to conserve memory. libsnes tends to use a very large pitch.
// Tightly pack our frame to conserve memory. libretro tends to use a very large pitch.
struct ffemu_video_data attr_data = *data;
if (attr_data.is_dupe)

View File

@ -134,7 +134,7 @@
# Used to calculate a suitable audio input rate.
# video_refresh_rate = 59.95
# Allows libsnes cores to set rotation modes.
# Allows libretro cores to set rotation modes.
# Setting this to false will honor, but ignore this request.
# This is useful for vertically oriented games where one manually rotates the monitor.
# video_allow_rotate = true
@ -222,13 +222,13 @@
# input_player3_joypad_index = 2
# input_player4_joypad_index = 3
# input_player5_joypad_index = 4
# Player 6-8 is not directly expected by libsnes API, but we'll futureproof it.
# Player 6-8 is not directly expected by libretro API, but we'll futureproof it.
# input_player6_joypad_index = 5
# input_player7_joypad_index = 6
# input_player8_joypad_index = 7
# Joypad buttons.
# Figure these out by using RetroArch-Phoenix or ssnes-joyconfig.
# Figure these out by using RetroArch-Phoenix or retroarch-joyconfig.
# You can use joypad hats with hnxx, where n is the hat, and xx is a string representing direction.
# E.g. "h0up"
# input_player1_a_btn =
@ -327,7 +327,7 @@
#### Misc
# Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
# Do note that rewinding will only work properly when using bSNES libsnes core atm.
# Do note that rewinding will only work properly when using bSNES libretro core atm.
# rewind_enable = false
# Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.