From 1fd2dc138a2b59f09b3e0f906cdfa2572b494623 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Fri, 15 Aug 2014 17:43:39 +0200 Subject: [PATCH] (iOS) Build fix --- apple/iOS/menu.h | 4 ++-- apple/iOS/menu.m | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apple/iOS/menu.h b/apple/iOS/menu.h index a1d6ec4f66..954b265d47 100644 --- a/apple/iOS/menu.h +++ b/apple/iOS/menu.h @@ -16,7 +16,7 @@ #ifndef __APPLE_RARCH_IOS_MENU_H__ #define __APPLE_RARCH_IOS_MENU_H__ -#include "../../history.h" +#include "../../playlist.h" #include "views.h" #include "../../settings_data.h" @@ -118,7 +118,7 @@ /* launching a file from the content history. */ /*************************************************/ @interface RAHistoryMenu : RAMenuBase -@property (nonatomic) content_history_t* history; +@property (nonatomic) content_playlist_t* history; - (id)initWithHistoryPath:(const char*)historyPath; @end diff --git a/apple/iOS/menu.m b/apple/iOS/menu.m index 00b98dcaeb..ece692f51a 100644 --- a/apple/iOS/menu.m +++ b/apple/iOS/menu.m @@ -645,14 +645,14 @@ static void RunActionSheet(const char* title, const struct string_list* items, U - (void)dealloc { if (_history) - content_history_free(_history); + content_playlist_free(_history); } - (id)initWithHistoryPath:(const char*)historyPath { if ((self = [super initWithStyle:UITableViewStylePlain])) { - _history = content_history_init(historyPath, 100); + _history = content_playlist_init(historyPath, 100); [self reloadData]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:BOXSTRING("Clear History") style:UIBarButtonItemStyleBordered target:self action:@selector(clearHistory)]; @@ -664,7 +664,7 @@ static void RunActionSheet(const char* title, const struct string_list* items, U - (void)clearHistory { if (_history) - content_history_clear(_history); + content_playlist_clear(_history); [self reloadData]; } @@ -674,12 +674,12 @@ static void RunActionSheet(const char* title, const struct string_list* items, U RAHistoryMenu* __weak weakSelf = self; NSMutableArray *section = [NSMutableArray arrayWithObject:BOXSTRING("")]; - for (i = 0; _history && i < content_history_size(_history); i ++) + for (i = 0; _history && i < content_playlist_size(_history); i ++) { - RAMenuItemBasic* item = [RAMenuItemBasic itemWithDescription:BOXSTRING(path_basename(content_history_get_path(weakSelf.history, i))) - action:^{ apple_run_core(0, NULL, content_history_get_core_path(weakSelf.history, i), - content_history_get_path(weakSelf.history, i)); } - detail:^{ return BOXSTRING(content_history_get_core_name(weakSelf.history, i)); }]; + RAMenuItemBasic* item = [RAMenuItemBasic itemWithDescription:BOXSTRING(path_basename(content_playlist_get_path(weakSelf.history, i))) + action:^{ apple_run_core(0, NULL, content_playlist_get_core_path(weakSelf.history, i), + content_playlist_get_path(weakSelf.history, i)); } + detail:^{ return BOXSTRING(content_playlist_get_core_name(weakSelf.history, i)); }]; [section addObject:item]; }