diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m index 89fb62e9b6..72ada4a3e5 100644 --- a/apple/OSX/platform.m +++ b/apple/OSX/platform.m @@ -300,8 +300,6 @@ static char** waiting_argv; if (_wantReload) apple_run_core(self.core, self.file.UTF8String); - else if(apple_use_tv_mode) - apple_run_core(nil, 0); else [[NSApplication sharedApplication] terminate:nil]; diff --git a/apple/common/RetroArch_Apple.h b/apple/common/RetroArch_Apple.h index 866d23a57b..3d270acd92 100644 --- a/apple/common/RetroArch_Apple.h +++ b/apple/common/RetroArch_Apple.h @@ -44,7 +44,6 @@ #endif extern char** apple_argv; -extern bool apple_use_tv_mode; extern NSString* apple_core; extern id apple_platform; diff --git a/apple/common/main.m b/apple/common/main.m index b527350717..2e42ff3622 100644 --- a/apple/common/main.m +++ b/apple/common/main.m @@ -23,7 +23,6 @@ id apple_platform; #pragma mark EMULATION -bool apple_use_tv_mode; NSString* apple_core; void apple_rarch_exited(void) @@ -32,12 +31,7 @@ void apple_rarch_exited(void) apple_core = 0; [apple_platform unloadingCore:used_core]; -#ifdef OSX [used_core release]; -#endif - - if (apple_use_tv_mode) - apple_run_core(nil, 0); } void apple_run_core(NSString* core, const char* file) diff --git a/apple/iOS/platform.m b/apple/iOS/platform.m index 6713c13eb3..6744fd55c3 100644 --- a/apple/iOS/platform.m +++ b/apple/iOS/platform.m @@ -64,24 +64,20 @@ const void* apple_get_frontend_settings(void) const char *SUBGROUP_NAME = "Frontend"; settings[0] = setting_data_group_setting(ST_GROUP, "Frontend Settings"); settings[1] = setting_data_group_setting(ST_SUB_GROUP, "Frontend"); - settings[2] = setting_data_bool_setting("ios_use_file_log", "Enable File Logging", - &apple_frontend_settings.logging_enabled, false, GROUP_NAME, SUBGROUP_NAME, apple_refresh_frontend_config); - settings[3] = setting_data_bool_setting("ios_tv_mode", "TV Mode", &apple_use_tv_mode, false, GROUP_NAME, SUBGROUP_NAME, NULL); - settings[4] = setting_data_string_setting(ST_STRING, "ios_btmode", "Bluetooth Input Type", apple_frontend_settings.bluetooth_mode, + settings[2] = setting_data_string_setting(ST_STRING, "ios_btmode", "Bluetooth Input Type", apple_frontend_settings.bluetooth_mode, sizeof(apple_frontend_settings.bluetooth_mode), "none", GROUP_NAME, SUBGROUP_NAME, apple_refresh_frontend_config); // Set ios_btmode options based on runtime environment if (btstack_try_load()) - settings[4].values = "icade|keyboard|small_keyboard|btstack"; + settings[2].values = "icade|keyboard|small_keyboard|btstack"; else - settings[4].values = "icade|keyboard|small_keyboard"; + settings[2].values = "icade|keyboard|small_keyboard"; - settings[5] = setting_data_string_setting(ST_STRING, "ios_orientations", "Screen Orientations", apple_frontend_settings.orientations, + settings[3] = setting_data_string_setting(ST_STRING, "ios_orientations", "Screen Orientations", apple_frontend_settings.orientations, sizeof(apple_frontend_settings.orientations), "both", GROUP_NAME, SUBGROUP_NAME, NULL); - settings[5].values = "both|landscape|portrait"; - settings[6] = setting_data_group_setting(ST_END_SUB_GROUP, 0); - - settings[7] = setting_data_group_setting(ST_END_GROUP, 0); + settings[3].values = "both|landscape|portrait"; + settings[4] = setting_data_group_setting(ST_END_SUB_GROUP, 0); + settings[5] = setting_data_group_setting(ST_END_GROUP, 0); } return settings;