mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(iOS) menu.m - more cleanups/build fixes

Browse Source
This commit is contained in:
twinaphex 2014-07-08 18:29:28 +02:00
parent dfc43810a7
commit 6cb17bc4cb
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apple/iOS/menu.m
View File

@ -875,10 +875,8 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
[cores addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("New Config for Core") [cores addObject:[RAMenuItemBasic itemWithDescription:BOXSTRING("New Config for Core")
action: ^{ [weakSelf createNewConfig]; }]]; action: ^{ [weakSelf createNewConfig]; }]];
core_list = (const core_info_list_t*)core_info_list_get();
if !(core_list) if (!(core_list = (const core_info_list_t*)core_info_list_get()))
return; return;
for (i = 0; i < core_list->count; i ++) for (i = 0; i < core_list->count; i ++)
@ -1003,16 +1001,11 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
- (UITableViewCell*)cellForTableView:(UITableView*)tableView - (UITableViewCell*)cellForTableView:(UITableView*)tableView
{ {
UITableViewCell *result;
static NSString* const cell_id = @"RAMenuItemCoreList"; static NSString* const cell_id = @"RAMenuItemCoreList";
UITableViewCell* result = [tableView dequeueReusableCellWithIdentifier:cell_id]; if (!(result = [tableView dequeueReusableCellWithIdentifier:cell_id]))
if (!result)
{
result = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cell_id]; result = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cell_id];
// UIButton* infoButton = [UIButton buttonWithType:UIButtonTypeInfoDark];
// [infoButton addTarget:self action:@selector(infoButtonTapped:) forControlEvents:UIControlEventTouchUpInside];
// result.accessoryView = infoButton;
}
result.textLabel.text = apple_get_core_display_name(self.core); result.textLabel.text = apple_get_core_display_name(self.core);
return result; return result;
@ -1060,7 +1053,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
[self.sections addObject:core_section]; [self.sections addObject:core_section];
if (core_list = (core_info_list_t*)core_info_list_get()) if ((core_list = (core_info_list_t*)core_info_list_get()))
{ {
if (_path) if (_path)
{ {
@ -1094,6 +1087,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
- (void)load:(uint32_t)count coresFromList:(const core_info_t*)list toSection:(NSMutableArray*)array - (void)load:(uint32_t)count coresFromList:(const core_info_t*)list toSection:(NSMutableArray*)array
{ {
int i; int i;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
[array addObject:[[RAMenuItemCoreList alloc] initWithCore:apple_get_core_id(&list[i]) parent:self]]; [array addObject:[[RAMenuItemCoreList alloc] initWithCore:apple_get_core_id(&list[i]) parent:self]];
} }
@ -1111,7 +1105,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
if ((self = [super initWithStyle:UITableViewStylePlain])) if ((self = [super initWithStyle:UITableViewStylePlain]))
{ {
FILE *file; FILE *file;
NSMutableArray* data = [NSMutableArray arrayWithObject:@""]; NSMutableArray* data = [NSMutableArray arrayWithObject:BOXSTRING("")];
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
@ -1154,7 +1148,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U
result = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cell_id]; result = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:cell_id];
result.selectionStyle = UITableViewCellSelectionStyleNone; result.selectionStyle = UITableViewCellSelectionStyleNone;
result.textLabel.text = @"Slot"; result.textLabel.text = BOXSTRING("Slot");
UISegmentedControl* accessory = [[UISegmentedControl alloc] initWithItems:@[@"0", @"1", @"2", @"3", @"4", @"5", @"6", @"7", @"8", @"9"]]; UISegmentedControl* accessory = [[UISegmentedControl alloc] initWithItems:@[@"0", @"1", @"2", @"3", @"4", @"5", @"6", @"7", @"8", @"9"]];
[accessory addTarget:[self class] action:@selector(changed:) forControlEvents:UIControlEventValueChanged]; [accessory addTarget:[self class] action:@selector(changed:) forControlEvents:UIControlEventValueChanged];