ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "(iOS) Add Global Configuration Enable option - will use one 

common" - revert for now - it's broken right now anyway

This reverts commit d51ea3bf2a.
This commit is contained in:
twinaphex 2013-06-14 02:10:36 +02:00
parent d51ea3bf2a
commit 4ea7b492f7
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ios/RetroArch/main.m
View File

@ -42,7 +42,6 @@
static ios_input_data_t g_input_data; static ios_input_data_t g_input_data;
static bool enable_btstack; static bool enable_btstack;
static bool enable_global_config;
static bool use_icade; static bool use_icade;
static uint32_t icade_buttons; static uint32_t icade_buttons;
@ -371,13 +370,7 @@ static void event_reload_config(void* userdata)
load_data->rom_path = strdup(path.UTF8String); load_data->rom_path = strdup(path.UTF8String);
load_data->sram_path = strdup(self.systemDirectory.UTF8String); load_data->sram_path = strdup(self.systemDirectory.UTF8String);
load_data->state_path = strdup(self.systemDirectory.UTF8String); load_data->state_path = strdup(self.systemDirectory.UTF8String);
if (enable_global_config) load_data->config_path = strdup(_module.configPath.UTF8String);
{
NSString *str = [NSString stringWithFormat:@"%@/retroarch.cfg", [RetroArch_iOS get].systemDirectory];
load_data->config_path = [str UTF8String];
}
else
load_data->config_path = strdup(_module.configPath.UTF8String);
load_data->verbose = false; load_data->verbose = false;
if (pthread_create(&_retroThread, 0, rarch_main_ios, load_data)) if (pthread_create(&_retroThread, 0, rarch_main_ios, load_data))
@ -449,7 +442,6 @@ static void event_reload_config(void* userdata)
// //
config_get_bool(conf, "ios_use_icade", &use_icade); config_get_bool(conf, "ios_use_icade", &use_icade);
config_get_bool(conf, "ios_use_btstack", &enable_btstack); config_get_bool(conf, "ios_use_btstack", &enable_btstack);
config_get_bool(conf, "global_config_enable", &enable_btstack);
if (enable_btstack) if (enable_btstack)
[self startBluetooth]; [self startBluetooth];

1
ios/RetroArch/settings/settings.m
View File

@ -290,7 +290,6 @@ static RASettingData* custom_action(NSString* action, id data)
NSArray* settings = [NSArray arrayWithObjects: NSArray* settings = [NSArray arrayWithObjects:
[NSArray arrayWithObjects:@"Frontend", [NSArray arrayWithObjects:@"Frontend",
custom_action(@"Diagnostic Log", nil), custom_action(@"Diagnostic Log", nil),
boolean_setting(config, @"global_config_enable", @"Use Global Configuration", @"false"),
nil], nil],
[NSArray arrayWithObjects:@"Bluetooth", [NSArray arrayWithObjects:@"Bluetooth",
// TODO: Note that with this turned off the native bluetooth is expected to be a real keyboard // TODO: Note that with this turned off the native bluetooth is expected to be a real keyboard