(iOS) Cleanups

This commit is contained in:
twinaphex 2015-05-06 00:00:37 +02:00
parent e264cc491e
commit 4402685627

View File

@ -341,6 +341,28 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
@end
enum
{
MENU_ITEM_BASIC = 0,
};
typedef struct ios_menu_item
{
char description[PATH_MAX_LENGTH];
} ios_menu_item_t;
static id *menu_item_init(ios_menu_item_t *item, unsigned type)
{
switch (type)
{
case MENU_ITEM_BASIC:
return [RAMenuItemBasic itemWithDescription:BOXSTRING(item->description)
action:^{}]
}
return nil;
}
/*********************************************/
/* RAMenuItemGeneralSetting */
/* A simple menu item that displays the */
@ -355,11 +377,14 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
+ (id)itemForSetting:(rarch_setting_t*)setting action:(void (^)())action
{
switch (setting->type) {
ios_menu_item_t item;
switch (setting->type)
{
case ST_NONE:
case ST_ACTION:
return [RAMenuItemBasic itemWithDescription:BOXSTRING("Shouldn't be called with ST_NONE or ST_ACTION")
action:^{}];
strlcpy(item.description, "Shouldn't be called with ST_NONE or ST_ACTION", sizeof(item.description));
return menu_item_init(&item, MENU_ITEM_BASIC);
case ST_BOOL:
return [[RAMenuItemBooleanSetting alloc] initWithSetting:setting action:action];
case ST_INT:
@ -379,8 +404,8 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
case ST_END_GROUP:
case ST_END_SUB_GROUP:
default:
return [RAMenuItemBasic itemWithDescription:BOXSTRING("Shouldn't be called with ST_*GROUP")
action:^{}];
strlcpy(item.description, "Shouldn't be called with ST_GROUP", sizeof(item.description));
return menu_item_init(&item, MENU_ITEM_BASIC);
}
if (setting->type == ST_STRING && setting->values)