summaryrefslogtreecommitdiff
path: root/macosx/PcsxrController.h
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-06-22 19:55:35 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-06-22 19:55:35 +0000
commitb6b2beab4846d5579514aed399d7eab56d6d02f0 (patch)
tree86be926c6a96344e7911486ed02ba1749bcaae10 /macosx/PcsxrController.h
parent33fb691cf7b6440102337966e34558f0a1851028 (diff)
downloadpcsxr-b6b2beab4846d5579514aed399d7eab56d6d02f0.tar.gz
Ignore files passed via the command line if we're parsing.
Calls to GUI functions should happen on the main thread. Put the [NSApp presentError:] in a block to the main thread. Put some bools in PcsxrController inside a struct with a size of 1. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85488 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrController.h')
-rwxr-xr-xmacosx/PcsxrController.h27
1 files changed, 16 insertions, 11 deletions
diff --git a/macosx/PcsxrController.h b/macosx/PcsxrController.h
index 836599b5..8688cde6 100755
--- a/macosx/PcsxrController.h
+++ b/macosx/PcsxrController.h
@@ -12,17 +12,22 @@ void ShowHelpAndExit(FILE* output, int exitCode) __dead2;
@interface PcsxrController : NSObject <NSApplicationDelegate>
{
- ConfigurationController *preferencesController;
- CheatController *cheatController;
- PluginList *pluginList;
-
- IBOutlet NSWindow *preferenceWindow;
- IBOutlet NSWindow *cheatWindow;
- IBOutlet RecentItemsMenu *recentItems;
-
- BOOL sleepInBackground;
- BOOL wasPausedBeforeBGSwitch;
- BOOL endAtEmuClose;
+ ConfigurationController *preferencesController;
+ CheatController *cheatController;
+ PluginList *pluginList;
+
+ IBOutlet NSWindow *preferenceWindow;
+ IBOutlet NSWindow *cheatWindow;
+ IBOutlet RecentItemsMenu *recentItems;
+
+ struct _PSXflags {
+ unsigned int sleepInBackground:1;
+ unsigned int wasPausedBeforeBGSwitch:1;
+ unsigned int endAtEmuClose:1;
+ unsigned int reserved:25;
+ } PSXflags;
+
+ NSMutableArray *skipFiles;
}
@property (readonly) RecentItemsMenu *recentItems;
@property (readonly) BOOL endAtEmuClose;