mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 06:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Apple) Build fixes

Browse Source
This commit is contained in:
Twinaphex 2015-03-18 20:15:40 +01:00
parent 3670ef2ac5
commit 0782cb5168
9 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apple/OSX/platform.m
View File

@ -41,10 +41,13 @@ void apple_rarch_exited(void)
- (void)sendEvent:(NSEvent *)event
{
NSEventType event_type;
apple_input_data_t *apple = NULL;
driver_t *driver = driver_get_ptr();
[super sendEvent:event];
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
NSEventType event_type = event.type;
apple = (apple_input_data_t*)driver->input_data;
event_type = event.type;
if (!apple)
return;
@ -190,9 +193,9 @@ static char** waiting_argv;
static void poll_iteration(void)
{
NSEvent *event;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
NSEvent *event = NULL;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (!apple)
return;

19
apple/OSX/settings.m
View File

@ -150,7 +150,8 @@ NSWindowDelegate>
int i;
NSMutableArray* thisGroup = nil;
NSMutableArray* thisSubGroup = nil;
const rarch_setting_t *setting_data = (const rarch_setting_t *)driver.menu->list_settings;
driver_t *driver = driver_get_ptr();
const rarch_setting_t *setting_data = (const rarch_setting_t *)driver->menu->list_settings;
self.settings = [NSMutableArray array];
@ -253,6 +254,8 @@ NSWindowDelegate>
- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
{
driver_t *driver = driver_get_ptr();
if (!tableColumn)
return nil;
@ -268,7 +271,7 @@ NSWindowDelegate>
else
{
char buffer[PATH_MAX_LENGTH];
rarch_setting_t *setting_data = (rarch_setting_t*)driver.menu->list_settings;
rarch_setting_t *setting_data = (rarch_setting_t*)driver->menu->list_settings;
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")])
@ -292,6 +295,7 @@ NSWindowDelegate>
- (NSCell*)outlineView:(NSOutlineView *)outlineView dataCellForTableColumn:(NSTableColumn *)tableColumn item:(id)item
{
const rarch_setting_t *setting_data, *setting;
driver_t *driver = driver_get_ptr();
if (!tableColumn)
return nil;
@ -302,7 +306,7 @@ NSWindowDelegate>
if ([[tableColumn identifier] isEqualToString:BOXSTRING("left")])
return [tableColumn dataCell];
setting_data = (const rarch_setting_t *)driver.menu->list_settings;
setting_data = (const rarch_setting_t *)driver->menu->list_settings;
setting = (const rarch_setting_t *)&setting_data[[item intValue]];
switch (setting->type)
@ -321,6 +325,8 @@ NSWindowDelegate>
- (IBAction)outlineViewClicked:(id)sender
{
id item;
driver_t *driver = driver_get_ptr();
if ([self.outline clickedColumn] != 1)
return;
@ -330,7 +336,7 @@ NSWindowDelegate>
return;
{
rarch_setting_t *setting_data = (rarch_setting_t*)driver.menu->list_settings;
rarch_setting_t *setting_data = (rarch_setting_t*)driver->menu->list_settings;
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
switch (setting->type)
@ -352,8 +358,9 @@ NSWindowDelegate>
- (void)controlTextDidEndEditing:(NSNotification*)notification
{
NSText* editor;
id item;
NSText* editor = NULL;
driver_t *driver = driver_get_ptr();
if ([notification object] != self.outline)
return;
@ -365,7 +372,7 @@ NSWindowDelegate>
return;
{
rarch_setting_t *setting_data = (rarch_setting_t *)driver.menu->list_settings;
rarch_setting_t *setting_data = (rarch_setting_t *)driver->menu->list_settings;
rarch_setting_t *setting = (rarch_setting_t*)&setting_data[[item intValue]];
NSString *editor_string = (NSString*)editor.string;

6
apple/common/apple_gamecontroller.m
View File

@ -40,7 +40,8 @@ static BOOL apple_gamecontroller_available(void)
static void apple_gamecontroller_poll(GCController *controller)
{
uint32_t slot, pause;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (!apple || !controller || controller.playerIndex == MAX_USERS)
return;
@ -100,7 +101,8 @@ void apple_gamecontroller_poll_all(void)
static void apple_gamecontroller_register(GCGamepad *gamepad)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
gamepad.valueChangedHandler = ^(GCGamepad *updateGamepad, GCControllerElement *element) {
apple_gamecontroller_poll(updateGamepad.controller);
};

12
apple/iOS/platform.m
View File

@ -92,7 +92,8 @@ extern CGFloat apple_gfx_ctx_get_native_scale(void);
static void handle_touch_event(NSArray* touches)
{
NSUInteger i;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
CGFloat scale = apple_gfx_ctx_get_native_scale();
if (!apple)
@ -253,6 +254,8 @@ void notify_content_loaded(void)
- (void)applicationDidFinishLaunching:(UIApplication *)application
{
driver_t *driver = NULL;
apple_platform = self;
[self setDelegate:self];
@ -268,8 +271,11 @@ void notify_content_loaded(void)
if (rarch_main(0, NULL))
apple_rarch_exited();
if ( driver.menu_ctx && driver.menu_ctx == &menu_ctx_ios && driver.menu && driver.menu->userdata ) {
ios_handle_t *ih = (ios_handle_t*)driver.menu->userdata;
driver = driver_get_ptr();
if ( driver->menu_ctx && driver->menu_ctx == &menu_ctx_ios && driver->menu && driver->menu->userdata )
{
ios_handle_t *ih = (ios_handle_t*)driver->menu->userdata;
ih->switch_to_ios = switch_to_ios;
ih->notify_content_loaded = notify_content_loaded;
}

18
input/drivers/apple_input.c
View File

@ -127,14 +127,16 @@ const struct apple_key_name_map_entry apple_key_name_map[] =
void apple_input_enable_small_keyboard(bool on)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (apple)
apple->small_keyboard_enabled = on;
}
void apple_input_enable_icade(bool on)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (!apple)
return;
@ -145,7 +147,8 @@ void apple_input_enable_icade(bool on)
void apple_input_reset_icade_buttons(void)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (apple)
apple->icade_buttons = 0;
@ -154,7 +157,8 @@ void apple_input_reset_icade_buttons(void)
int32_t apple_input_find_any_key(void)
{
unsigned i;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver =driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (!apple)
return 0;
@ -172,7 +176,8 @@ int32_t apple_input_find_any_key(void)
int32_t apple_input_find_any_button(uint32_t port)
{
unsigned i, buttons = 0;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (!apple)
return -1;
@ -195,7 +200,8 @@ int32_t apple_input_find_any_button(uint32_t port)
int32_t apple_input_find_any_axis(uint32_t port)
{
int i;
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (apple && apple->joypad)
apple->joypad->poll();

12
input/drivers_joypad/apple_joypad_hid.c
View File

@ -49,7 +49,8 @@ static void hid_pad_connection_send_control(void *data, uint8_t* data_buf, size_
static void hid_device_input_callback(void* context, IOReturn result,
void* sender, IOHIDValueRef value)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
struct pad_connection* connection = (struct pad_connection*)context;
IOHIDElementRef element = IOHIDValueGetElement(value);
uint32_t type = IOHIDElementGetType(element);
@ -119,7 +120,8 @@ static void hid_device_input_callback(void* context, IOReturn result,
static void remove_device(void* context, IOReturn result, void* sender)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
struct pad_connection* connection = (struct pad_connection*)context;
if (connection && connection->slot < MAX_USERS)
@ -290,7 +292,8 @@ static void apple_joypad_destroy(void)
static bool apple_joypad_button(unsigned port, uint16_t joykey)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
uint64_t buttons = pad_connection_get_buttons(&slots[port], port);
if (!apple || joykey == NO_BTN)
@ -314,7 +317,8 @@ static uint64_t apple_joypad_get_buttons(unsigned port)
static int16_t apple_joypad_axis(unsigned port, uint32_t joyaxis)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
int16_t val = 0;
if (!apple || joyaxis == AXIS_NONE)

6
input/drivers_joypad/apple_joypad_ios.c
View File

@ -48,7 +48,8 @@ static void apple_joypad_destroy(void)
static bool apple_joypad_button(unsigned port, uint16_t joykey)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
uint64_t buttons = pad_connection_get_buttons(&slots[port], port);
if (!apple || joykey == NO_BTN)
return false;
@ -70,7 +71,8 @@ static uint64_t apple_joypad_get_buttons(unsigned port)
static int16_t apple_joypad_axis(unsigned port, uint32_t joyaxis)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
int16_t val = 0;
if (!apple || joyaxis == AXIS_NONE)

9
input/keyboard_event_apple.c
View File

@ -67,7 +67,8 @@ static bool handle_small_keyboard(unsigned* code, bool down)
{ KEY_X, KP_2 }, { KEY_C, KP_3 },
{ 0 }
};
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
unsigned translated_code = 0;
if (!map_initialized)
@ -118,7 +119,8 @@ static void handle_icade_event(unsigned keycode)
{ false, 5 }, { true , 11 }, { false, 0 }, { false, 1 }, // 8
{ false, 4 }, { true , 1 }, { false, -1 }, { false, -1 } // C
};
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (apple->icade_enabled && (keycode < 0x20)
&& (icade_map[keycode].button >= 0))
@ -135,7 +137,8 @@ static void handle_icade_event(unsigned keycode)
void apple_input_keyboard_event(bool down,
unsigned code, uint32_t character, uint32_t mod, unsigned device)
{
apple_input_data_t *apple = (apple_input_data_t*)driver.input_data;
driver_t *driver = driver_get_ptr();
apple_input_data_t *apple = (apple_input_data_t*)driver->input_data;
if (!apple)
return;

1
menu/drivers/rgui.c
View File

@ -355,7 +355,6 @@ static void rgui_render(void)
const char *core_version = NULL;
menu_handle_t *menu = menu_driver_resolve();
runloop_t *runloop = rarch_main_get_ptr();
driver_t *driver = driver_get_ptr();
if (!menu)
return;