From 072c52fe4e170df1d2442d6a2ff0a5a75b3d0340 Mon Sep 17 00:00:00 2001 From: meancoot Date: Tue, 2 Apr 2013 19:20:08 -0400 Subject: [PATCH] (iOS) Build fix; add some missing system key settings. --- ios/RetroArch/RetroArch_iOS.m | 2 +- ios/RetroArch/settings/RASettingsList.m | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ios/RetroArch/RetroArch_iOS.m b/ios/RetroArch/RetroArch_iOS.m index 5bb60e6ff3..b6147062fd 100644 --- a/ios/RetroArch/RetroArch_iOS.m +++ b/ios/RetroArch/RetroArch_iOS.m @@ -170,7 +170,7 @@ { // Need to clear these otherwise stale versions may be used! memset(g_settings.input.overlay, 0, sizeof(g_settings.input.overlay)); - memset(g_settings.video.bsnes_shader_path, 0, sizeof(g_settings.video.bsnes_shader_path)); + memset(g_settings.video.xml_shader_path, 0, sizeof(g_settings.video.xml_shader_path)); if (_isRunning) { diff --git a/ios/RetroArch/settings/RASettingsList.m b/ios/RetroArch/settings/RASettingsList.m index a058883229..4721687800 100644 --- a/ios/RetroArch/settings/RASettingsList.m +++ b/ios/RetroArch/settings/RASettingsList.m @@ -153,7 +153,7 @@ static RASettingData* custom_action(NSString* action) boolean_setting(config, @"video_crop_overscan", @"Crop Overscan", @"true"), boolean_setting(config, @"video_scale_integer", @"Integer Scaling", @"false"), aspect_setting(config, @"Aspect Ratio"), - subpath_setting(config, @"video_bsnes_shader", @"Shader", @"", shader_path, @"shader"), + subpath_setting(config, @"video_xml_shader", @"Shader", @"", shader_path, @"shader"), nil], [NSArray arrayWithObjects:@"Audio", @@ -200,7 +200,9 @@ static RASettingData* custom_action(NSString* action) group_setting(@"System Keys", [NSArray arrayWithObjects: // TODO: Many of these strings will be cut off on an iPhone [NSArray arrayWithObjects:@"System Keys", - button_setting(config, @"input_enable_hotkey", @"Hotkey Enable (Always on if not set)", @""), + button_setting(config, @"input_menu_toggle", @"Show Menu", @"F1"), + button_setting(config, @"input_disk_eject_toggle", @"Insert/Eject Disk", @""), + button_setting(config, @"input_disk_next", @"Cycle Disks", @""), button_setting(config, @"input_save_state", @"Save State", @"f2"), button_setting(config, @"input_load_state", @"Load State", @"f4"), button_setting(config, @"input_state_slot_increase", @"Next State Slot", @"f7"), @@ -211,6 +213,7 @@ static RASettingData* custom_action(NSString* action) button_setting(config, @"input_slowmotion", @"Slow Motion", @"e"), button_setting(config, @"input_reset", @"Reset", @"h"), button_setting(config, @"input_exit_emulator", @"Close Game", @"escape"), + button_setting(config, @"input_enable_hotkey", @"Hotkey Enable (Always on if not set)", @""), nil], nil]), nil],