mirror of
https://github.com/libretro/RetroArch
synced 2025-03-17 10:21:26 +00:00
Merge branch 'master' of https://github.com/libretro/RetroArch
This commit is contained in:
commit
1c5e328043
@ -138,23 +138,17 @@ static char** waiting_argv;
|
||||
|
||||
@interface RetroArch_OSX()
|
||||
@property (nonatomic, retain) NSWindowController* settingsWindow;
|
||||
@property (nonatomic, retain) NSWindow IBOutlet* coreSelectSheet;
|
||||
@property (nonatomic, copy) NSString* core;
|
||||
@end
|
||||
|
||||
@implementation RetroArch_OSX
|
||||
|
||||
@synthesize window = _window;
|
||||
@synthesize settingsWindow = _settingsWindow;
|
||||
@synthesize coreSelectSheet = _coreSelectSheet;
|
||||
@synthesize core = _core;
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
[_window release];
|
||||
[_coreSelectSheet release];
|
||||
[_settingsWindow release];
|
||||
[_core release];
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
@ -273,8 +267,6 @@ static void poll_iteration(void)
|
||||
|
||||
if (core_name)
|
||||
event_command(EVENT_CMD_LOAD_CONTENT);
|
||||
else
|
||||
[self chooseCore];
|
||||
|
||||
[sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
|
||||
}
|
||||
@ -315,33 +307,6 @@ static void poll_iteration(void)
|
||||
[[NSApplication sharedApplication] runModalForWindow:panel];
|
||||
}
|
||||
|
||||
- (void)chooseCore
|
||||
{
|
||||
[[NSApplication sharedApplication] beginSheet:self.coreSelectSheet modalForWindow:self.window modalDelegate:nil didEndSelector:nil contextInfo:nil];
|
||||
[[NSApplication sharedApplication] runModalForWindow:self.coreSelectSheet];
|
||||
}
|
||||
|
||||
- (IBAction)coreWasChosen:(id)sender
|
||||
{
|
||||
global_t *global = global_get_ptr();
|
||||
|
||||
[[NSApplication sharedApplication] stopModal];
|
||||
[[NSApplication sharedApplication] endSheet:self.coreSelectSheet returnCode:0];
|
||||
[self.coreSelectSheet orderOut:self];
|
||||
|
||||
if (global && global->system.shutdown)
|
||||
return;
|
||||
|
||||
if (global && !global->main_is_init)
|
||||
{
|
||||
/* TODO/FIXME: Set core/content here. */
|
||||
event_command(EVENT_CMD_LOAD_CORE);
|
||||
event_command(EVENT_CMD_LOAD_CONTENT);
|
||||
}
|
||||
else
|
||||
event_command(EVENT_CMD_QUIT);
|
||||
}
|
||||
|
||||
- (void)loadingCore:(const NSString*)core withFile:(const char*)file
|
||||
{
|
||||
if (file)
|
||||
|
@ -206,9 +206,6 @@ void get_ios_version(int *major, int *minor);
|
||||
{
|
||||
NSWindow* _window;
|
||||
NSWindowController* _settingsWindow;
|
||||
NSWindow* _coreSelectSheet;
|
||||
NSString* _file;
|
||||
NSString* _core;
|
||||
}
|
||||
|
||||
@property (nonatomic, retain) NSWindow IBOutlet* window;
|
||||
|
@ -312,7 +312,6 @@ const gfx_ctx_driver_t gfx_ctx_emscripten = {
|
||||
NULL, /* get_video_output_prev */
|
||||
NULL, /* get_video_output_next */
|
||||
NULL, /* get_metrics */
|
||||
NULL,
|
||||
gfx_ctx_emscripten_translate_aspect,
|
||||
gfx_ctx_emscripten_update_window_title,
|
||||
gfx_ctx_emscripten_check_window,
|
||||
|
Loading…
x
Reference in New Issue
Block a user