diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-01-25 19:18:46 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2014-01-25 19:18:46 +0000 |
| commit | b98e99fd07def79e974b263d52d9719c435a367b (patch) | |
| tree | 22055ffb5bcf6816cede9f2fce55ee134495c36a | |
| parent | 4e48823ad72a3d1e595409eb69f2948ab084c00d (diff) | |
| download | pcsxr-b98e99fd07def79e974b263d52d9719c435a367b.tar.gz | |
OS X: Minor changes to the PcsxrPlugin class.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@88470 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | macosx/PcsxrPlugin.h | 5 | ||||
| -rwxr-xr-x | macosx/PcsxrPlugin.m | 15 |
2 files changed, 8 insertions, 12 deletions
diff --git a/macosx/PcsxrPlugin.h b/macosx/PcsxrPlugin.h index 7cb03514..f2a0f854 100755 --- a/macosx/PcsxrPlugin.h +++ b/macosx/PcsxrPlugin.h @@ -8,10 +8,7 @@ #import <Foundation/Foundation.h> -@interface PcsxrPlugin : NSObject { - void *pluginRef; -} - +@interface PcsxrPlugin : NSObject @property (readonly, copy) NSString *path; @property (readonly, strong) NSString *name; @property (readonly) int type; diff --git a/macosx/PcsxrPlugin.m b/macosx/PcsxrPlugin.m index faaca580..f326c040 100755 --- a/macosx/PcsxrPlugin.m +++ b/macosx/PcsxrPlugin.m @@ -23,12 +23,11 @@ @property long version; @property (readwrite) int type; @property int active; - - +@property void *pluginRef; @end @implementation PcsxrPlugin - +@synthesize pluginRef; @synthesize active; @synthesize fullPlugPath; @synthesize modDate; @@ -249,7 +248,7 @@ long (*func)(void); func = SysLoadSym(pluginRef, [funcName cStringUsingEncoding:NSASCIIStringEncoding]); - if (SysLibError() == nil) { + if (SysLibError() == NULL) { func(); } else { NSBeep(); @@ -271,7 +270,7 @@ init = initArg = SysLoadSym(pluginRef, [PluginSymbolName(aType, @"init") cStringUsingEncoding:NSASCIIStringEncoding]); - if (SysLibError() == nil) { + if (SysLibError() == NULL) { if (aType != PSE_LT_PAD) { res = init(); } else { @@ -292,7 +291,7 @@ long (*shutdown)(void); shutdown = SysLoadSym(pluginRef, [PluginSymbolName(aType, @"shutdown") cStringUsingEncoding:NSASCIIStringEncoding]); - if (SysLibError() == nil) { + if (SysLibError() == NULL) { shutdown(); } @@ -326,7 +325,7 @@ SysLoadSym(pluginRef, [PluginSymbolNameAbout(aType) cStringUsingEncoding:NSASCIIStringEncoding]); - return (SysLibError() == nil); + return (SysLibError() == NULL); } - (BOOL)hasConfigureAs:(int)aType @@ -334,7 +333,7 @@ SysLoadSym(pluginRef, [PluginSymbolNameConfigure(aType) cStringUsingEncoding:NSASCIIStringEncoding]); - return (SysLibError() == nil); + return (SysLibError() == NULL); } - (void)aboutAs:(int)aType |