diff options
| author | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-09 20:49:54 +0000 |
|---|---|---|
| committer | SND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-11-09 20:49:54 +0000 |
| commit | 4d55a8b8254dff61fdc7b1959f6aef7eafbd9439 (patch) | |
| tree | fb5e56131a7c8b729641c70e7a87883ebaea5186 | |
| parent | 71d6c56271e2650b1a2f5149521a5b1896084710 (diff) | |
| download | pcsxr-4d55a8b8254dff61fdc7b1959f6aef7eafbd9439.tar.gz | |
Patch 10767 (Durandal_1707).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97
81 files changed, 798 insertions, 6930 deletions
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c index 6b075d18..03baad3f 100644 --- a/libpcsxcore/cdriso.c +++ b/libpcsxcore/cdriso.c @@ -29,6 +29,7 @@ #else
#include <pthread.h>
#include <sys/time.h>
+#include <unistd.h>
#endif
static FILE *cdHandle = NULL;
@@ -269,7 +270,7 @@ static void *playthread(void *param) // Vib Ribbon: decoded buffer IRQ
- iso_play_cdbuf = sndbuffer;
+ iso_play_cdbuf = (u16 *)sndbuffer;
iso_play_bufptr = 0;
}
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 8bfa58f7..889beb9a 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -501,7 +501,7 @@ static void ReadTrack( u8 *time ) { }
-static CDXA_Attenuation( s16 *buf, int size, int stereo, int attenuate_type )
+static void CDXA_Attenuation( s16 *buf, int size, int stereo, int attenuate_type )
{
s16 *spsound;
s32 lc,rc;
@@ -1632,9 +1632,9 @@ void cdrReadInterrupt() { int ret = xa_decode_sector(&cdr.Xa, cdr.Transfer+4, cdr.FirstSector);
if (!ret) {
+#if 0
int xa_type;
-#if 0
// save - set only for FirstSector
xa_type = cdr.Xa.stereo;
diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c index bcf0ddb4..711d96f3 100644 --- a/libpcsxcore/debug.c +++ b/libpcsxcore/debug.c @@ -396,7 +396,7 @@ void ProcessDebug() { if ((psxRegs.code >> 26) == 3) {
MarkMap(_JumpTarget_, MAP_EXEC_JAL);
}
- if (((psxRegs.code >> 26) == 0) && ((psxRegs.code && 0x3F) == 9)) {
+ if (((psxRegs.code >> 26) == 0) && ((psxRegs.code & 0x3F) == 9)) {
MarkMap(_Rd_, MAP_EXEC_JAL);
}
}
diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c index a1c761ec..f743d06b 100644 --- a/libpcsxcore/ix86/iR3000A.c +++ b/libpcsxcore/ix86/iR3000A.c @@ -330,6 +330,7 @@ void iLogM32(u32 mem) { ADD32ItoR(ESP, 4*2);
}
+#if 0
static void iDumpRegs() {
int i, j;
@@ -340,6 +341,7 @@ static void iDumpRegs() { printf("\n");
}
}
+#endif
void iDumpBlock(char *ptr) {
FILE *f;
@@ -1628,6 +1630,7 @@ void recLWL() { }
}
+#if 0
static void recLWBlock(int count) {
u32 *code = (u32 *)PSXM(pc);
int i, respsave;
@@ -1702,6 +1705,7 @@ static void recLWBlock(int count) { x86SetJ32(j32Ptr[5]);
resp = respsave;
}
+#endif
extern u32 LWR_MASK[4];
extern u32 LWR_SHIFT[4];
@@ -1983,6 +1987,7 @@ static void recSW() { }
//#endif
+#if 0
static void recSWBlock(int count) {
u32 *code;
int i, respsave;
@@ -2050,6 +2055,7 @@ static void recSWBlock(int count) { x86SetJ32(j32Ptr[5]);
resp = respsave;
}
+#endif
extern u32 SWL_MASK[4];
extern u32 SWL_SHIFT[4];
diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c index 9c5721af..a9a66b7a 100644 --- a/libpcsxcore/ix86_64/iR3000A-64.c +++ b/libpcsxcore/ix86_64/iR3000A-64.c @@ -343,6 +343,7 @@ void iLogM32(u32 mem) { ADD32ItoR(ESP, 8*2);
}
+#if 0
static void iDumpRegs() {
int i, j;
@@ -353,6 +354,7 @@ static void iDumpRegs() { printf("\n");
}
}
+#endif
void iDumpBlock(char *ptr) {
FILE *f;
@@ -2942,7 +2944,7 @@ static void recRecompile() { x86Align(32);
ptr = x86Ptr;
- PC_RECP(psxRegs.pc) = x86Ptr;
+ PC_RECP(psxRegs.pc) = (uptr)x86Ptr;
pc = psxRegs.pc;
pcold = pc;
diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c index 18c8ea13..f8fa31b7 100644 --- a/libpcsxcore/mdec.c +++ b/libpcsxcore/mdec.c @@ -324,7 +324,7 @@ unsigned short *rl2blk(int *blk, unsigned short *mdec_rl) { #define CLAMP_SCALE8(a) (CLAMP8(SCALE8(a)))
#define CLAMP_SCALE5(a) (CLAMP5(SCALE5(a)))
-inline void putlinebw15(u16 *image, int *Yblk) {
+static inline void putlinebw15(u16 *image, int *Yblk) {
int i;
int A = (mdec.reg0 & MDEC0_STP) ? 0x8000 : 0;
@@ -335,7 +335,7 @@ inline void putlinebw15(u16 *image, int *Yblk) { }
}
-inline void putquadrgb15(u16 *image, int *Yblk, int Cr, int Cb) {
+static inline void putquadrgb15(u16 *image, int *Yblk, int Cr, int Cb) {
int Y, R, G, B;
int A = (mdec.reg0 & MDEC0_STP) ? 0x8000 : 0;
R = MULR(Cr);
@@ -353,7 +353,7 @@ inline void putquadrgb15(u16 *image, int *Yblk, int Cr, int Cb) { image[17] = MAKERGB15(CLAMP_SCALE5(Y + R), CLAMP_SCALE5(Y + G), CLAMP_SCALE5(Y + B), A);
}
-inline void yuv2rgb15(int *blk, unsigned short *image) {
+static inline void yuv2rgb15(int *blk, unsigned short *image) {
int x, y;
int *Yblk = blk + DSIZE2 * 2;
int *Crblk = blk;
@@ -376,7 +376,7 @@ inline void yuv2rgb15(int *blk, unsigned short *image) { }
}
-inline void putlinebw24(u8 * image, int *Yblk) {
+static inline void putlinebw24(u8 * image, int *Yblk) {
int i;
unsigned char Y;
for (i = 0; i < 8 * 3; i += 3, Yblk++) {
@@ -387,7 +387,7 @@ inline void putlinebw24(u8 * image, int *Yblk) { }
}
-inline void putquadrgb24(u8 * image, int *Yblk, int Cr, int Cb) {
+static inline void putquadrgb24(u8 * image, int *Yblk, int Cr, int Cb) {
int Y, R, G, B;
R = MULR(Cr);
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c index 454a5e55..51694aa4 100644 --- a/libpcsxcore/psxcounters.c +++ b/libpcsxcore/psxcounters.c @@ -101,7 +101,7 @@ void verboseLog( s32 level, const char *str, ... ) vsnprintf( buf, sizeof(buf), str, va );
va_end( va );
- printf( buf );
+ printf( "%s", buf );
fflush( stdout );
}
}
diff --git a/libpcsxcore/psxhw.c b/libpcsxcore/psxhw.c index bd6a14c9..77e1fd02 100644 --- a/libpcsxcore/psxhw.c +++ b/libpcsxcore/psxhw.c @@ -24,7 +24,7 @@ #include "psxhw.h" #include "mdec.h" #include "cdrom.h" -#include "gpu.h"
+#include "gpu.h" void psxHwReset() { if (Config.Sio) psxHu32ref(0x1070) |= SWAP32(0x80); @@ -41,9 +41,9 @@ u8 psxHwRead8(u32 add) { unsigned char hard; switch (add) { - case 0x1f801040: hard = sioRead8();break;
+ case 0x1f801040: hard = sioRead8();break; #ifdef ENABLE_SIO1API - case 0x1f801050: hard = SIO1_readData8(); break;
+ case 0x1f801050: hard = SIO1_readData8(); break; #endif case 0x1f801800: hard = cdrRead0(); break; case 0x1f801801: hard = cdrRead1(); break; @@ -106,7 +106,7 @@ u16 psxHwRead16(u32 add) { #ifdef PAD_LOG PAD_LOG("sio read16 %x; ret = %x\n", add&0xf, hard); #endif - return hard;
+ return hard; #ifdef ENABLE_SIO1API case 0x1f801050: hard = SIO1_readData16(); @@ -119,7 +119,7 @@ u16 psxHwRead16(u32 add) { return hard; case 0x1f80105e: hard = SIO1_readBaud16(); - return hard;
+ return hard; #endif case 0x1f801100: hard = psxRcntRcount(0); @@ -209,11 +209,11 @@ u32 psxHwRead32(u32 add) { #ifdef PAD_LOG PAD_LOG("sio read32 ;ret = %x\n", hard); #endif - return hard;
+ return hard; #ifdef ENABLE_SIO1API case 0x1f801050: hard = SIO1_readData32(); - return hard;
+ return hard; #endif #ifdef PSXHW_LOG case 0x1f801060: @@ -349,9 +349,9 @@ u32 psxHwRead32(u32 add) { void psxHwWrite8(u32 add, u8 value) { switch (add) { - case 0x1f801040: sioWrite8(value); break;
+ case 0x1f801040: sioWrite8(value); break; #ifdef ENABLE_SIO1API - case 0x1f801050: SIO1_writeData8(value); break;
+ case 0x1f801050: SIO1_writeData8(value); break; #endif case 0x1f801800: cdrWrite0(value); break; case 0x1f801801: cdrWrite1(value); break; @@ -403,7 +403,7 @@ void psxHwWrite16(u32 add, u16 value) { #ifdef PAD_LOG PAD_LOG ("sio write16 %x, %x\n", add&0xf, value); #endif - return;
+ return; #ifdef ENABLE_SIO1API case 0x1f801050: SIO1_writeData16(value); @@ -416,7 +416,7 @@ void psxHwWrite16(u32 add, u16 value) { return; case 0x1f80105e: SIO1_writeBaud16(value); - return;
+ return; #endif case 0x1f801070: #ifdef PSXHW_LOG @@ -518,11 +518,11 @@ void psxHwWrite32(u32 add, u32 value) { #ifdef PAD_LOG PAD_LOG("sio write32 %x\n", value); #endif - return;
+ return; #ifdef ENABLE_SIO1API case 0x1f801050: SIO1_writeData32(value); - return;
+ return; #endif #ifdef PSXHW_LOG case 0x1f801060: @@ -725,19 +725,19 @@ void psxHwWrite32(u32 add, u32 value) { psxRcntWtarget(2, value & 0xffff); return; default: - // Dukes of Hazard 2 - car engine noise
- if (add>=0x1f801c00 && add<0x1f801e00) {
- SPU_writeRegister(add, value&0xffff);
-
- add += 2;
- value >>= 16;
-
- if (add>=0x1f801c00 && add<0x1f801e00)
- SPU_writeRegister(add, value&0xffff);
- return;
- }
-
-
+ // Dukes of Hazard 2 - car engine noise + if (add>=0x1f801c00 && add<0x1f801e00) { + SPU_writeRegister(add, value&0xffff); + + add += 2; + value >>= 16; + + if (add>=0x1f801c00 && add<0x1f801e00) + SPU_writeRegister(add, value&0xffff); + return; + } + + psxHu32ref(add) = SWAPu32(value); #ifdef PSXHW_LOG PSXHW_LOG("*Unknown 32bit write at address %x value %x\n", add, value); diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c index 1f7514b2..b2954b4c 100644 --- a/libpcsxcore/psxinterpreter.c +++ b/libpcsxcore/psxinterpreter.c @@ -38,7 +38,7 @@ static u32 branchPC; #define debugI()
#endif
-inline void execI();
+static inline void execI();
// Subsets
void (*psxBSC[64])();
@@ -409,7 +409,7 @@ static int psxDelayBranchTest(u32 tar1) { return psxDelayBranchExec(tmp2);
}
-__inline void doBranch(u32 tar) {
+static __inline void doBranch(u32 tar) {
u32 *code;
u32 tmp;
@@ -910,7 +910,7 @@ void psxTestSWInts() { }
}
-__inline void MTC0(int reg, u32 val) {
+static __inline void MTC0(int reg, u32 val) {
// SysPrintf("MTC0 %d: %x\n", reg, val);
switch (reg) {
case 12: // Status
@@ -1087,7 +1087,7 @@ static void intShutdown() { }
// interpreter execution
-inline void execI() {
+static inline void execI() {
u32 *code = Read_ICache(psxRegs.pc, FALSE);
psxRegs.code = ((code == NULL) ? 0 : SWAP32(*code));
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m index a1623cde..9c52375b 100644 --- a/macosx/ConfigurationController.m +++ b/macosx/ConfigurationController.m @@ -47,18 +47,22 @@ [openDlg setCanChooseFiles:YES]; [openDlg setCanChooseDirectories:NO]; - path = [NSString stringWithCString:mcd]; - - if ([openDlg runModalForDirectory:[path stringByDeletingLastPathComponent] file:[path lastPathComponent]] == NSOKButton) { - NSArray* files = [openDlg filenames]; - strcpy(mcd, (const char *)[[files objectAtIndex:0] fileSystemRepresentation]); - - [label setTitleWithMnemonic:[NSString stringWithCString:mcd]]; + path = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:mcd length:strlen(mcd)]; + + [openDlg setDirectoryURL:[NSURL fileURLWithPath:[path stringByDeletingLastPathComponent]]]; + [openDlg setNameFieldStringValue:[path lastPathComponent]]; + + if ([openDlg runModal] == NSFileHandlingPanelOKButton) { + NSArray* urls = [openDlg URLs]; + NSString *mcdPath = [[urls objectAtIndex:0] path]; + strcpy(mcd, (const char *)[mcdPath fileSystemRepresentation]); + + [label setTitleWithMnemonic:mcdPath]; if (tag == 1) - [[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd1"]; + [[NSUserDefaults standardUserDefaults] setObject:mcdPath forKey:@"Mcd1"]; else - [[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd2"]; + [[NSUserDefaults standardUserDefaults] setObject:mcdPath forKey:@"Mcd2"]; } } @@ -73,17 +77,21 @@ if (tag == 1) { mcd = Config.Mcd1; label = mcd1Label; } else { mcd = Config.Mcd2; label = mcd2Label; } - path = [NSString stringWithCString:mcd]; + path = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:mcd length:strlen(mcd)]; - if ([openDlg runModalForDirectory:[path stringByDeletingLastPathComponent] file:@"New Memory Card File.mcr"] == NSOKButton) { - strcpy(mcd, (const char *)[[openDlg filename] fileSystemRepresentation]); + [openDlg setDirectoryURL:[NSURL fileURLWithPath:[path stringByDeletingLastPathComponent]]]; + [openDlg setNameFieldStringValue:@"New Memory Card File.mcr"]; + + if ([openDlg runModal] == NSFileHandlingPanelOKButton) { + NSString *mcdPath = [[openDlg URL] path]; + strcpy(mcd, (const char *)[mcdPath fileSystemRepresentation]); - [label setTitleWithMnemonic:[NSString stringWithCString:mcd]]; + [label setTitleWithMnemonic:mcdPath]; if (tag == 1) - [[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd1"]; + [[NSUserDefaults standardUserDefaults] setObject:mcdPath forKey:@"Mcd1"]; else - [[NSUserDefaults standardUserDefaults] setObject:[NSString stringWithCString:mcd] forKey:@"Mcd2"]; + [[NSUserDefaults standardUserDefaults] setObject:mcdPath forKey:@"Mcd2"]; CreateMcd(mcd); } @@ -105,9 +113,9 @@ if ([sender pullsDown]) { NSArray *items = [sender itemArray]; - int i; + NSUInteger i; - for (i=0; i<[items count]; i++) + for (i = 0; i < [items count]; i++) [[items objectAtIndex:i] setState:NSOffState]; [[sender selectedItem] setState:NSOnState]; @@ -155,8 +163,8 @@ } // setup labels - [mcd1Label setTitleWithMnemonic:[NSString stringWithCString:Config.Mcd1]]; - [mcd2Label setTitleWithMnemonic:[NSString stringWithCString:Config.Mcd2]]; + [mcd1Label setTitleWithMnemonic:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.Mcd1 length:strlen(Config.Mcd1)]]; + [mcd2Label setTitleWithMnemonic:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.Mcd2 length:strlen(Config.Mcd2)]]; int tag = [defaults integerForKey:@"AutoDetectVideoType"]; if (tag) diff --git a/macosx/English.lproj/AddPluginSheet.nib/classes.nib b/macosx/English.lproj/AddPluginSheet.nib/classes.nib index 2ba5ac33..e69de29b 100644 --- a/macosx/English.lproj/AddPluginSheet.nib/classes.nib +++ b/macosx/English.lproj/AddPluginSheet.nib/classes.nib @@ -1,14 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {closeAddPluginSheet = id; }; - CLASS = PcsxrPluginDocument; - LANGUAGE = ObjC; - OUTLETS = {addPluginSheet = NSWindow; pluginName = NSTextField; }; - SUPERCLASS = NSDocument; - }, - {CLASS = "java.lang.Object"; LANGUAGE = Java; } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/English.lproj/AddPluginSheet.nib/info.nib b/macosx/English.lproj/AddPluginSheet.nib/info.nib index 3af05e0c..e69de29b 100644 --- a/macosx/English.lproj/AddPluginSheet.nib/info.nib +++ b/macosx/English.lproj/AddPluginSheet.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>69 10 356 240 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>364.0</string> - <key>IBOpenObjects</key> - <array> - <integer>10</integer> - </array> - <key>IBSystem Version</key> - <string>7H63</string> -</dict> -</plist> diff --git a/macosx/English.lproj/Configuration.nib/classes.nib b/macosx/English.lproj/Configuration.nib/classes.nib index 1198eea5..e69de29b 100644 --- a/macosx/English.lproj/Configuration.nib/classes.nib +++ b/macosx/English.lproj/Configuration.nib/classes.nib @@ -1,49 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = { - mcdChangeClicked = id; - mcdNewClicked = id; - setCheckbox = id; - setCheckboxInverse = id; - setVideoType = id; - }; - CLASS = ConfigurationController; - LANGUAGE = ObjC; - OUTLETS = { - autoVTypeCell = id; - bwMdecCell = id; - cdromPlugin = PluginController; - consoleOutputCell = id; - graphicsPlugin = PluginController; - mcd1Label = NSTextField; - mcd2Label = NSTextField; - noCDAudioCell = id; - noXaAudioCell = id; - padPlugin = PluginController; - rCountFixCell = id; - sioIrqAlwaysCell = id; - soundPlugin = PluginController; - spuIrqAlwaysCell = id; - usesDynarecCell = id; - usesHleCell = id; - vSyncWAFixCell = id; - vTypePALCell = id; - }; - SUPERCLASS = NSWindowController; - }, - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {doAbout = id; doConfigure = id; selectPlugin = id; }; - CLASS = PluginController; - LANGUAGE = ObjC; - OUTLETS = { - aboutButton = NSButton; - configureButton = NSButton; - pluginMenu = NSPopUpButton; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/English.lproj/Configuration.nib/info.nib b/macosx/English.lproj/Configuration.nib/info.nib index aefee7be..e69de29b 100644 --- a/macosx/English.lproj/Configuration.nib/info.nib +++ b/macosx/English.lproj/Configuration.nib/info.nib @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>187 160 486 240 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>446.1</string> - <key>IBLockedObjects</key> - <array/> - <key>IBLockedTabItems</key> - <array> - <integer>240</integer> - </array> - <key>IBOpenObjects</key> - <array> - <integer>21</integer> - </array> - <key>IBSystem Version</key> - <string>8P2137</string> -</dict> -</plist> diff --git a/macosx/English.lproj/PCSXR.nib/classes.nib b/macosx/English.lproj/PCSXR.nib/classes.nib index 9cab4898..e69de29b 100644 --- a/macosx/English.lproj/PCSXR.nib/classes.nib +++ b/macosx/English.lproj/PCSXR.nib/classes.nib @@ -1,25 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = { - defrost = id; - ejectCD = id; - freeze = id; - fullscreen = id; - pause = id; - preferences = id; - reset = id; - runBios = id; - runCD = id; - runExe = id; - runIso = id; - }; - CLASS = PcsxrController; - LANGUAGE = ObjC; - OUTLETS = {memCardWindow = NSWindow; preferenceWindow = NSWindow; }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/English.lproj/PCSXR.nib/designable.nib b/macosx/English.lproj/PCSXR.nib/designable.nib index 10d9fc59..e69de29b 100644 --- a/macosx/English.lproj/PCSXR.nib/designable.nib +++ b/macosx/English.lproj/PCSXR.nib/designable.nib @@ -1,1572 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> - <data> - <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">10J567</string> - <string key="IBDocument.InterfaceBuilderVersion">823</string> - <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">462.00</string> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">823</string> - </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="56"/> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <string key="NS.key.0">PluginDependencyRecalculationVersion</string> - <integer value="1" key="NS.object.0"/> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1052055471"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomObject" id="489548945"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSCustomObject" id="687968813"> - <string key="NSClassName">FirstResponder</string> - </object> - <object class="NSCustomObject" id="544582716"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSMenu" id="67636175"> - <string key="NSTitle">PCSXR</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="201125624"> - <reference key="NSMenu" ref="67636175"/> - <string key="NSTitle">PCSXR</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSOnImage" id="926047672"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuCheckmark</string> - </object> - <object class="NSCustomResource" key="NSMixedImage" id="645484985"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuMixedState</string> - </object> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="474241117"> - <string key="NSTitle">PCSXR</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="713959643"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">About PCSXR</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="994850327"> - <reference key="NSMenu" ref="474241117"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="971794455"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">Preferences...</string> - <string key="NSKeyEquiv">,</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="643142854"> - <reference key="NSMenu" ref="474241117"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="951743966"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">Services</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="900344810"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">Services</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <string key="NSName">_NSServicesMenu</string> - </object> - </object> - <object class="NSMenuItem" id="1002294178"> - <reference key="NSMenu" ref="474241117"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="59221501"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">Hide PCSXR</string> - <string key="NSKeyEquiv">h</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="328899864"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">Hide Others</string> - <string key="NSKeyEquiv">h</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="230436915"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">Show All</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="1065569173"> - <reference key="NSMenu" ref="474241117"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="570733638"> - <reference key="NSMenu" ref="474241117"/> - <string key="NSTitle">Quit PCSXR</string> - <string key="NSKeyEquiv">q</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - </object> - <string key="NSName">_NSAppleMenu</string> - </object> - </object> - <object class="NSMenuItem" id="622845102"> - <reference key="NSMenu" ref="67636175"/> - <string key="NSTitle">File</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="164090988"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">File</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="998122505"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Run CD</string> - <string key="NSKeyEquiv">r</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="771918864"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Run ISO...</string> - <string key="NSKeyEquiv">i</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="471681869"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Run BIOS</string> - <string key="NSKeyEquiv">b</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="74319449"> - <reference key="NSMenu" ref="164090988"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="297547826"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Pause</string> - <string key="NSKeyEquiv">p</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="705784993"> - <reference key="NSMenu" ref="164090988"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="81274320"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Eject CD</string> - <string key="NSKeyEquiv">e</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="679906586"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Close</string> - <string key="NSKeyEquiv">w</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="311949754"> - <reference key="NSMenu" ref="164090988"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="124150811"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Freeze State</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="186554230"> - <string key="NSTitle">Freeze State</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="1023912461"> - <reference key="NSMenu" ref="186554230"/> - <string key="NSTitle">Slot 1</string> - <string key="NSKeyEquiv">1</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">1</int> - </object> - <object class="NSMenuItem" id="232633961"> - <reference key="NSMenu" ref="186554230"/> - <string key="NSTitle">Slot 2</string> - <string key="NSKeyEquiv">2</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">2</int> - </object> - <object class="NSMenuItem" id="747940602"> - <reference key="NSMenu" ref="186554230"/> - <string key="NSTitle">Slot 3</string> - <string key="NSKeyEquiv">3</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">3</int> - </object> - <object class="NSMenuItem" id="245364309"> - <reference key="NSMenu" ref="186554230"/> - <string key="NSTitle">Slot 4</string> - <string key="NSKeyEquiv">4</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">4</int> - </object> - <object class="NSMenuItem" id="958472095"> - <reference key="NSMenu" ref="186554230"/> - <string key="NSTitle">Slot 5</string> - <string key="NSKeyEquiv">5</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">5</int> - </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="1070611541"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Defrost State</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="8470546"> - <string key="NSTitle">Defrost State</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="832305532"> - <reference key="NSMenu" ref="8470546"/> - <string key="NSTitle">Slot 1</string> - <string key="NSKeyEquiv">1</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">1</int> - </object> - <object class="NSMenuItem" id="680777026"> - <reference key="NSMenu" ref="8470546"/> - <string key="NSTitle">Slot 2</string> - <string key="NSKeyEquiv">2</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">2</int> - </object> - <object class="NSMenuItem" id="919615015"> - <reference key="NSMenu" ref="8470546"/> - <string key="NSTitle">Slot 3</string> - <string key="NSKeyEquiv">3</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">3</int> - </object> - <object class="NSMenuItem" id="480149417"> - <reference key="NSMenu" ref="8470546"/> - <string key="NSTitle">Slot 4</string> - <string key="NSKeyEquiv">4</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">4</int> - </object> - <object class="NSMenuItem" id="220857467"> - <reference key="NSMenu" ref="8470546"/> - <string key="NSTitle">Slot 5</string> - <string key="NSKeyEquiv">5</string> - <int key="NSKeyEquivModMask">1572864</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <int key="NSTag">5</int> - </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="72490035"> - <reference key="NSMenu" ref="164090988"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="351708473"> - <reference key="NSMenu" ref="164090988"/> - <string key="NSTitle">Reset</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="94376406"> - <reference key="NSMenu" ref="67636175"/> - <string key="NSTitle">Window</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="1049236981"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">Window</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="1054009981"> - <reference key="NSMenu" ref="1049236981"/> - <string key="NSTitle">Minimize</string> - <string key="NSKeyEquiv">m</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="899940707"> - <reference key="NSMenu" ref="1049236981"/> - <string key="NSTitle">Fullscreen</string> - <string type="base64-UTF8" key="NSKeyEquiv">Gw</string> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="771858262"> - <reference key="NSMenu" ref="1049236981"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - <object class="NSMenuItem" id="644533453"> - <reference key="NSMenu" ref="1049236981"/> - <string key="NSTitle">Bring All to Front</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - </object> - <string key="NSName">_NSWindowsMenu</string> - </object> - </object> - <object class="NSMenuItem" id="583922353"> - <reference key="NSMenu" ref="67636175"/> - <string key="NSTitle">Help</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="93586374"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">Help</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="151383531"> - <reference key="NSMenu" ref="93586374"/> - <string key="NSTitle">PCSXR Help</string> - <string key="NSKeyEquiv">?</string> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="926047672"/> - <reference key="NSMixedImage" ref="645484985"/> - </object> - </object> - </object> - </object> - </object> - <string key="NSName">_NSMainMenu</string> - </object> - <object class="NSCustomObject" id="113826207"> - <string key="NSClassName">PcsxrController</string> - </object> - </object> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">performMiniaturize:</string> - <reference key="source" ref="687968813"/> - <reference key="destination" ref="1054009981"/> - </object> - <int key="connectionID">37</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">arrangeInFront:</string> - <reference key="source" ref="687968813"/> - <reference key="destination" ref="644533453"/> - </object> - <int key="connectionID">39</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">terminate:</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="570733638"/> - </object> - <int key="connectionID">139</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">hideOtherApplications:</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="328899864"/> - </object> - <int key="connectionID">146</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">hide:</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="59221501"/> - </object> - <int key="connectionID">152</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">unhideAllApplications:</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="230436915"/> - </object> - <int key="connectionID">153</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">reset:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="351708473"/> - </object> - <int key="connectionID">255</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">preferences:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="971794455"/> - </object> - <int key="connectionID">263</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">orderFrontStandardAboutPanel:</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="713959643"/> - </object> - <int key="connectionID">264</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">showHelp:</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="151383531"/> - </object> - <int key="connectionID">265</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">pause:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="297547826"/> - </object> - <int key="connectionID">269</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">performClose:</string> - <reference key="source" ref="687968813"/> - <reference key="destination" ref="679906586"/> - </object> - <int key="connectionID">272</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">runCD:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="998122505"/> - </object> - <int key="connectionID">275</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">freeze:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="1023912461"/> - </object> - <int key="connectionID">294</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">freeze:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="232633961"/> - </object> - <int key="connectionID">295</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">freeze:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="747940602"/> - </object> - <int key="connectionID">296</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">defrost:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="832305532"/> - </object> - <int key="connectionID">297</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">defrost:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="680777026"/> - </object> - <int key="connectionID">298</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">defrost:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="919615015"/> - </object> - <int key="connectionID">299</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">fullscreen:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="899940707"/> - </object> - <int key="connectionID">301</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="489548945"/> - <reference key="destination" ref="113826207"/> - </object> - <int key="connectionID">302</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">ejectCD:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="81274320"/> - </object> - <int key="connectionID">304</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">runIso:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="771918864"/> - </object> - <int key="connectionID">305</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">runBios:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="471681869"/> - </object> - <int key="connectionID">307</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">freeze:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="245364309"/> - </object> - <int key="connectionID">313</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">freeze:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="958472095"/> - </object> - <int key="connectionID">314</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">defrost:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="480149417"/> - </object> - <int key="connectionID">315</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">defrost:</string> - <reference key="source" ref="113826207"/> - <reference key="destination" ref="220857467"/> - </object> - <int key="connectionID">316</int> - </object> - </object> - <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <object class="NSArray" key="object" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <reference key="children" ref="1052055471"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-2</int> - <reference key="object" ref="489548945"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-1</int> - <reference key="object" ref="687968813"/> - <reference key="parent" ref="0"/> - <string key="objectName">First Responder</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">29</int> - <reference key="object" ref="67636175"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="94376406"/> - <reference ref="201125624"/> - <reference ref="622845102"/> - <reference ref="583922353"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">MainMenu</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">19</int> - <reference key="object" ref="94376406"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1049236981"/> - </object> - <reference key="parent" ref="67636175"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">24</int> - <reference key="object" ref="1049236981"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="644533453"/> - <reference ref="1054009981"/> - <reference ref="771858262"/> - <reference ref="899940707"/> - </object> - <reference key="parent" ref="94376406"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="644533453"/> - <reference key="parent" ref="1049236981"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">23</int> - <reference key="object" ref="1054009981"/> - <reference key="parent" ref="1049236981"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">92</int> - <reference key="object" ref="771858262"/> - <reference key="parent" ref="1049236981"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">300</int> - <reference key="object" ref="899940707"/> - <reference key="parent" ref="1049236981"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">56</int> - <reference key="object" ref="201125624"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="474241117"/> - </object> - <reference key="parent" ref="67636175"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">57</int> - <reference key="object" ref="474241117"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="713959643"/> - <reference ref="971794455"/> - <reference ref="951743966"/> - <reference ref="59221501"/> - <reference ref="570733638"/> - <reference ref="643142854"/> - <reference ref="1002294178"/> - <reference ref="328899864"/> - <reference ref="1065569173"/> - <reference ref="230436915"/> - <reference ref="994850327"/> - </object> - <reference key="parent" ref="201125624"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">58</int> - <reference key="object" ref="713959643"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">129</int> - <reference key="object" ref="971794455"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">131</int> - <reference key="object" ref="951743966"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="900344810"/> - </object> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">130</int> - <reference key="object" ref="900344810"/> - <reference key="parent" ref="951743966"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">134</int> - <reference key="object" ref="59221501"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">136</int> - <reference key="object" ref="570733638"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">143</int> - <reference key="object" ref="643142854"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">144</int> - <reference key="object" ref="1002294178"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">145</int> - <reference key="object" ref="328899864"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">149</int> - <reference key="object" ref="1065569173"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">150</int> - <reference key="object" ref="230436915"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">266</int> - <reference key="object" ref="994850327"/> - <reference key="parent" ref="474241117"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">83</int> - <reference key="object" ref="622845102"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="164090988"/> - </object> - <reference key="parent" ref="67636175"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">81</int> - <reference key="object" ref="164090988"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="351708473"/> - <reference ref="297547826"/> - <reference ref="705784993"/> - <reference ref="679906586"/> - <reference ref="72490035"/> - <reference ref="998122505"/> - <reference ref="124150811"/> - <reference ref="311949754"/> - <reference ref="1070611541"/> - <reference ref="771918864"/> - <reference ref="81274320"/> - <reference ref="471681869"/> - <reference ref="74319449"/> - </object> - <reference key="parent" ref="622845102"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">244</int> - <reference key="object" ref="351708473"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">267</int> - <reference key="object" ref="297547826"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">268</int> - <reference key="object" ref="705784993"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">270</int> - <reference key="object" ref="679906586"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">271</int> - <reference key="object" ref="72490035"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">273</int> - <reference key="object" ref="998122505"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">280</int> - <reference key="object" ref="124150811"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="186554230"/> - </object> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">278</int> - <reference key="object" ref="186554230"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1023912461"/> - <reference ref="232633961"/> - <reference ref="747940602"/> - <reference ref="245364309"/> - <reference ref="958472095"/> - </object> - <reference key="parent" ref="124150811"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">281</int> - <reference key="object" ref="1023912461"/> - <reference key="parent" ref="186554230"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">286</int> - <reference key="object" ref="232633961"/> - <reference key="parent" ref="186554230"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">292</int> - <reference key="object" ref="747940602"/> - <reference key="parent" ref="186554230"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">309</int> - <reference key="object" ref="245364309"/> - <reference key="parent" ref="186554230"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">310</int> - <reference key="object" ref="958472095"/> - <reference key="parent" ref="186554230"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">282</int> - <reference key="object" ref="311949754"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">284</int> - <reference key="object" ref="1070611541"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="8470546"/> - </object> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">285</int> - <reference key="object" ref="8470546"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="832305532"/> - <reference ref="680777026"/> - <reference ref="919615015"/> - <reference ref="480149417"/> - <reference ref="220857467"/> - </object> - <reference key="parent" ref="1070611541"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">287</int> - <reference key="object" ref="832305532"/> - <reference key="parent" ref="8470546"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">289</int> - <reference key="object" ref="680777026"/> - <reference key="parent" ref="8470546"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">293</int> - <reference key="object" ref="919615015"/> - <reference key="parent" ref="8470546"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">311</int> - <reference key="object" ref="480149417"/> - <reference key="parent" ref="8470546"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">312</int> - <reference key="object" ref="220857467"/> - <reference key="parent" ref="8470546"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">290</int> - <reference key="object" ref="771918864"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">303</int> - <reference key="object" ref="81274320"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">306</int> - <reference key="object" ref="471681869"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">308</int> - <reference key="object" ref="74319449"/> - <reference key="parent" ref="164090988"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">103</int> - <reference key="object" ref="583922353"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="93586374"/> - </object> - <reference key="parent" ref="67636175"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">106</int> - <reference key="object" ref="93586374"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="151383531"/> - </object> - <reference key="parent" ref="583922353"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">111</int> - <reference key="object" ref="151383531"/> - <reference key="parent" ref="93586374"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">253</int> - <reference key="object" ref="113826207"/> - <reference key="parent" ref="0"/> - <string key="objectName">PcsxrController</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-3</int> - <reference key="object" ref="544582716"/> - <reference key="parent" ref="0"/> - <string key="objectName">Application</string> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>103.IBPluginDependency</string> - <string>103.ImportedFromIB2</string> - <string>106.IBPluginDependency</string> - <string>106.ImportedFromIB2</string> - <string>111.IBPluginDependency</string> - <string>111.ImportedFromIB2</string> - <string>129.IBPluginDependency</string> - <string>129.ImportedFromIB2</string> - <string>130.IBPluginDependency</string> - <string>130.ImportedFromIB2</string> - <string>131.IBPluginDependency</string> - <string>131.ImportedFromIB2</string> - <string>134.IBPluginDependency</string> - <string>134.ImportedFromIB2</string> - <string>136.IBPluginDependency</string> - <string>136.ImportedFromIB2</string> - <string>143.IBPluginDependency</string> - <string>143.ImportedFromIB2</string> - <string>144.IBPluginDependency</string> - <string>144.ImportedFromIB2</string> - <string>145.IBPluginDependency</string> - <string>145.ImportedFromIB2</string> - <string>149.IBPluginDependency</string> - <string>149.ImportedFromIB2</string> - <string>150.IBPluginDependency</string> - <string>150.ImportedFromIB2</string> - <string>19.IBPluginDependency</string> - <string>19.ImportedFromIB2</string> - <string>23.IBPluginDependency</string> - <string>23.ImportedFromIB2</string> - <string>24.IBPluginDependency</string> - <string>24.ImportedFromIB2</string> - <string>244.IBPluginDependency</string> - <string>244.ImportedFromIB2</string> - <string>253.ImportedFromIB2</string> - <string>266.IBPluginDependency</string> - <string>266.ImportedFromIB2</string> - <string>267.IBPluginDependency</string> - <string>267.ImportedFromIB2</string> - <string>268.IBPluginDependency</string> - <string>268.ImportedFromIB2</string> - <string>270.IBPluginDependency</string> - <string>270.ImportedFromIB2</string> - <string>271.IBPluginDependency</string> - <string>271.ImportedFromIB2</string> - <string>273.IBPluginDependency</string> - <string>273.ImportedFromIB2</string> - <string>278.IBPluginDependency</string> - <string>278.ImportedFromIB2</string> - <string>280.IBPluginDependency</string> - <string>280.ImportedFromIB2</string> - <string>281.IBPluginDependency</string> - <string>281.ImportedFromIB2</string> - <string>282.IBPluginDependency</string> - <string>282.ImportedFromIB2</string> - <string>284.IBPluginDependency</string> - <string>284.ImportedFromIB2</string> - <string>285.IBPluginDependency</string> - <string>285.ImportedFromIB2</string> - <string>286.IBPluginDependency</string> - <string>286.ImportedFromIB2</string> - <string>287.IBPluginDependency</string> - <string>287.ImportedFromIB2</string> - <string>289.IBPluginDependency</string> - <string>289.ImportedFromIB2</string> - <string>29.IBEditorWindowLastContentRect</string> - <string>29.IBPluginDependency</string> - <string>29.ImportedFromIB2</string> - <string>290.IBPluginDependency</string> - <string>290.ImportedFromIB2</string> - <string>292.IBPluginDependency</string> - <string>292.ImportedFromIB2</string> - <string>293.IBPluginDependency</string> - <string>293.ImportedFromIB2</string> - <string>300.IBPluginDependency</string> - <string>300.ImportedFromIB2</string> - <string>303.IBPluginDependency</string> - <string>303.ImportedFromIB2</string> - <string>306.IBPluginDependency</string> - <string>306.ImportedFromIB2</string> - <string>308.IBPluginDependency</string> - <string>308.ImportedFromIB2</string> - <string>309.IBPluginDependency</string> - <string>309.ImportedFromIB2</string> - <string>310.IBPluginDependency</string> - <string>310.ImportedFromIB2</string> - <string>311.IBPluginDependency</string> - <string>311.ImportedFromIB2</string> - <string>312.IBPluginDependency</string> - <string>312.ImportedFromIB2</string> - <string>5.IBPluginDependency</string> - <string>5.ImportedFromIB2</string> - <string>56.IBPluginDependency</string> - <string>56.ImportedFromIB2</string> - <string>57.IBEditorWindowLastContentRect</string> - <string>57.IBPluginDependency</string> - <string>57.ImportedFromIB2</string> - <string>58.IBPluginDependency</string> - <string>58.ImportedFromIB2</string> - <string>81.IBPluginDependency</string> - <string>81.ImportedFromIB2</string> - <string>83.IBPluginDependency</string> - <string>83.ImportedFromIB2</string> - <string>92.IBPluginDependency</string> - <string>92.ImportedFromIB2</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{317, 826}, {250, 20}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{329, 643}, {182, 183}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="sourceID"/> - <int key="maxID">317</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">FirstResponder</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">PcsxrController</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>defrost:</string> - <string>ejectCD:</string> - <string>freeze:</string> - <string>fullscreen:</string> - <string>pause:</string> - <string>preferences:</string> - <string>reset:</string> - <string>runBios:</string> - <string>runCD:</string> - <string>runIso:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>defrost:</string> - <string>ejectCD:</string> - <string>freeze:</string> - <string>fullscreen:</string> - <string>pause:</string> - <string>preferences:</string> - <string>reset:</string> - <string>runBios:</string> - <string>runCD:</string> - <string>runIso:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">defrost:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">ejectCD:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">freeze:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">fullscreen:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">pause:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">preferences:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">reset:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">runBios:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">runCD:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">runIso:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>memCardWindow</string> - <string>preferenceWindow</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSWindow</string> - <string>NSWindow</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>memCardWindow</string> - <string>preferenceWindow</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">memCardWindow</string> - <string key="candidateClassName">NSWindow</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">preferenceWindow</string> - <string key="candidateClassName">NSWindow</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">PcsxrController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">PcsxrController</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">runExe:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">runExe:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">runExe:</string> - <string key="candidateClassName">id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - </object> - <object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">NSObject</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBFrameworkSource</string> - <string key="minorKey">ExceptionHandling.framework/Headers/NSExceptionHandler.h</string> - </object> - </object> - </object> - </object> - <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <integer value="1060" key="NS.object.0"/> - </object> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> - <integer value="3000" key="NS.object.0"/> - </object> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <nil key="IBDocument.LastKnownRelativeProjectPath"/> - <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMenuCheckmark</string> - <string>NSMenuMixedState</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{9, 8}</string> - <string>{7, 2}</string> - </object> - </object> - </data> -</archive> diff --git a/macosx/English.lproj/PCSXR.nib/info.nib b/macosx/English.lproj/PCSXR.nib/info.nib index a5d6a496..e69de29b 100644 --- a/macosx/English.lproj/PCSXR.nib/info.nib +++ b/macosx/English.lproj/PCSXR.nib/info.nib @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>442 353 492 320 0 0 1024 746 </string> - <key>IBEditorPositions</key> - <dict> - <key>29</key> - <string>134 613 219 44 0 0 1024 746 </string> - </dict> - <key>IBFramework Version</key> - <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>29</integer> - </array> - <key>IBSystem Version</key> - <string>8P2137</string> -</dict> -</plist> diff --git a/macosx/Info.plist b/macosx/Info.plist index 218c754e..b0cf0eb6 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -201,5 +201,12 @@ </array> <key>UTImportedTypeDeclarations</key> <array/> + <key>LSMinimumSystemVersionByArchitecture</key> + <dict> + <key>i386</key> + <string>10.6.0</string> + <key>x86_64</key> + <string>10.6.0</string> + </dict> </dict> </plist> diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj index 4024e955..23137bd4 100644 --- a/macosx/Pcsxr.xcodeproj/project.pbxproj +++ b/macosx/Pcsxr.xcodeproj/project.pbxproj @@ -3,22 +3,22 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 28F0C3C6146521A700A90285 /* Configuration.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3C4146521A700A90285 /* Configuration.xib */; }; + 28F0C3C9146521B000A90285 /* PCSXR.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3C7146521B000A90285 /* PCSXR.xib */; }; + 28F0C3CC146521B700A90285 /* AddPluginSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3CA146521B700A90285 /* AddPluginSheet.xib */; }; 2B143D06078A2CBD00AF745A /* PCSXR.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D01078A2CBD00AF745A /* PCSXR.icns */; }; 2B143D07078A2CBD00AF745A /* pcsxrfreeze.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D02078A2CBD00AF745A /* pcsxrfreeze.icns */; }; 2B143D08078A2CBD00AF745A /* pcsxrmemcard.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D03078A2CBD00AF745A /* pcsxrmemcard.icns */; }; 2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D04078A2CBD00AF745A /* psxbios.icns */; }; 2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D05078A2CBD00AF745A /* psxplugin.icns */; }; 2B3E356D06937D1C00763C7D /* PcsxrPluginDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E356B06937D1C00763C7D /* PcsxrPluginDocument.m */; }; - 2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */; }; 2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B02C04304E145D000880C5B /* Carbon.framework */; }; 2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4DE98E05FF9307003EFEF0 /* PluginController.m */; }; - 2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B00514CE260026D74D /* Configuration.nib */; }; 2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B20514CE260026D74D /* InfoPlist.strings */; }; - 2BB3D6A505427FE200831ACB /* PCSXR.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B40514CE260026D74D /* PCSXR.nib */; }; 2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BBB1786051E0D9700B84448 /* Credits.rtf */; }; 2BB3D6BE05427FE200831ACB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA178A505148D9D0026D74D /* main.m */; }; 2BB3D6BF05427FE200831ACB /* PcsxrController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD3D051C56D200D12034 /* PcsxrController.m */; }; @@ -96,6 +96,13 @@ /* End PBXBuildRule section */ /* Begin PBXContainerItemProxy section */ + 28B467F01463D0020083F129 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5599695E13AFCD2900B0216B; + remoteInfo = PeopsAL; + }; 713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */; @@ -187,6 +194,9 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 28F0C3C5146521A700A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Configuration.xib; sourceTree = "<group>"; }; + 28F0C3C8146521B000A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = PCSXR.xib; sourceTree = "<group>"; }; + 28F0C3CB146521B700A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = AddPluginSheet.xib; sourceTree = "<group>"; }; 2B02C04304E145D000880C5B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 2B143D01078A2CBD00AF745A /* PCSXR.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PCSXR.icns; sourceTree = "<group>"; }; 2B143D02078A2CBD00AF745A /* pcsxrfreeze.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxrfreeze.icns; sourceTree = "<group>"; }; @@ -196,27 +206,24 @@ 2B2189D204D96C7A00179945 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 2B3E356A06937D1C00763C7D /* PcsxrPluginDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrPluginDocument.h; sourceTree = "<group>"; }; 2B3E356B06937D1C00763C7D /* PcsxrPluginDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrPluginDocument.m; sourceTree = "<group>"; }; - 2B3E35BB069384D100763C7D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = AddPluginSheet.nib; sourceTree = "<group>"; }; 2B4DE98D05FF9307003EFEF0 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; }; 2B4DE98E05FF9307003EFEF0 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; }; 2B690C760635C65C00CDA575 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; }; 2B6E8AAE04C832040017A3B1 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; }; 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; 2B75FD3C051C56D200D12034 /* PcsxrController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PcsxrController.h; sourceTree = "<group>"; }; - 2B75FD3D051C56D200D12034 /* PcsxrController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PcsxrController.m; sourceTree = "<group>"; }; + 2B75FD3D051C56D200D12034 /* PcsxrController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2B75FD4A051C8A7400D12034 /* ConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ConfigurationController.h; sourceTree = "<group>"; }; - 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ConfigurationController.m; sourceTree = "<group>"; }; + 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = ConfigurationController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2B976C00074C14B4007C050A /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; }; - 2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; - 2BA178B10514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Configuration.nib; sourceTree = "<group>"; }; + 2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = main.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2BA178B30514CE260026D74D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; }; - 2BA178B50514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PCSXR.nib; sourceTree = "<group>"; }; 2BA44360052DB2EA00E21DDD /* PcsxrPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxrPlugin.h; sourceTree = "<group>"; }; - 2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxrPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; }; + 2BA44361052DB2EA00E21DDD /* PcsxrPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PcsxrPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 2BB3D6D105427FE200831ACB /* PCSXR.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSXR.app; sourceTree = BUILT_PRODUCTS_DIR; }; 2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; }; - 2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; }; + 2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginList.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; }; 2BBB1791051E113B00B84448 /* EmuThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuThread.h; sourceTree = "<group>"; }; 2BBB1792051E113B00B84448 /* EmuThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmuThread.m; sourceTree = "<group>"; }; @@ -254,9 +261,9 @@ 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSoftGPU.xcodeproj; path = plugins/DFXVideo/PeopsSoftGPU.xcodeproj; sourceTree = SOURCE_ROOT; }; 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsXGL.xcodeproj; path = plugins/PeopsXgl/PeopsXGL.xcodeproj; sourceTree = "<group>"; }; 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFInput.xcodeproj; path = plugins/DFInput/DFInput.xcodeproj; sourceTree = "<group>"; }; - 71F4C5600FDED12800529849 /* cdriso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdriso.c; sourceTree = "<group>"; }; + 71F4C5600FDED12800529849 /* cdriso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; path = cdriso.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 71F4C5610FDED12800529849 /* cdriso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdriso.h; sourceTree = "<group>"; }; - 71F4C5620FDED12800529849 /* cdrom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdrom.c; sourceTree = "<group>"; }; + 71F4C5620FDED12800529849 /* cdrom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; path = cdrom.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 71F4C5630FDED12800529849 /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdrom.h; sourceTree = "<group>"; }; 71F4C5640FDED12800529849 /* cheat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheat.c; sourceTree = "<group>"; }; 71F4C5650FDED12800529849 /* cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheat.h; sourceTree = "<group>"; }; @@ -377,10 +384,10 @@ isa = PBXGroup; children = ( 2BBB1786051E0D9700B84448 /* Credits.rtf */, - 2BA178B00514CE260026D74D /* Configuration.nib */, + 28F0C3C4146521A700A90285 /* Configuration.xib */, 2BA178B20514CE260026D74D /* InfoPlist.strings */, - 2BA178B40514CE260026D74D /* PCSXR.nib */, - 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */, + 28F0C3C7146521B000A90285 /* PCSXR.xib */, + 28F0C3CA146521B700A90285 /* AddPluginSheet.xib */, ); name = Resources; path = English.lproj; @@ -522,6 +529,7 @@ isa = PBXGroup; children = ( 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */, + 28B467F11463D0020083F129 /* PeopsAL.psxplugin */, ); name = Products; sourceTree = "<group>"; @@ -603,8 +611,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsxr" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -645,6 +656,13 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ + 28B467F11463D0020083F129 /* PeopsAL.psxplugin */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = PeopsAL.psxplugin; + remoteRef = 28B467F01463D0020083F129 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */ = { isa = PBXReferenceProxy; fileType = wrapper.cfbundle; @@ -687,16 +705,16 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */, 2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */, - 2BB3D6A505427FE200831ACB /* PCSXR.nib in Resources */, 2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */, - 2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */, 2B143D06078A2CBD00AF745A /* PCSXR.icns in Resources */, 2B143D07078A2CBD00AF745A /* pcsxrfreeze.icns in Resources */, 2B143D08078A2CBD00AF745A /* pcsxrmemcard.icns in Resources */, 2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */, 2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */, + 28F0C3C6146521A700A90285 /* Configuration.xib in Resources */, + 28F0C3C9146521B000A90285 /* PCSXR.xib in Resources */, + 28F0C3CC146521B700A90285 /* AddPluginSheet.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -786,36 +804,36 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ - 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */ = { + 28F0C3C4146521A700A90285 /* Configuration.xib */ = { isa = PBXVariantGroup; children = ( - 2B3E35BB069384D100763C7D /* English */, + 28F0C3C5146521A700A90285 /* English */, ); - name = AddPluginSheet.nib; + name = Configuration.xib; sourceTree = "<group>"; }; - 2BA178B00514CE260026D74D /* Configuration.nib */ = { + 28F0C3C7146521B000A90285 /* PCSXR.xib */ = { isa = PBXVariantGroup; children = ( - 2BA178B10514CE260026D74D /* English */, + 28F0C3C8146521B000A90285 /* English */, ); - name = Configuration.nib; + name = PCSXR.xib; sourceTree = "<group>"; }; - 2BA178B20514CE260026D74D /* InfoPlist.strings */ = { + 28F0C3CA146521B700A90285 /* AddPluginSheet.xib */ = { isa = PBXVariantGroup; children = ( - 2BA178B30514CE260026D74D /* English */, + 28F0C3CB146521B700A90285 /* English */, ); - name = InfoPlist.strings; + name = AddPluginSheet.xib; sourceTree = "<group>"; }; - 2BA178B40514CE260026D74D /* PCSXR.nib */ = { + 2BA178B20514CE260026D74D /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( - 2BA178B50514CE260026D74D /* English */, + 2BA178B30514CE260026D74D /* English */, ); - name = PCSXR.nib; + name = InfoPlist.strings; sourceTree = "<group>"; }; 2BBB1786051E0D9700B84448 /* Credits.rtf */ = { @@ -829,7 +847,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 71F353F40FD98DFE00CBEC28 /* Development */ = { + 71F353F40FD98DFE00CBEC28 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -837,7 +855,6 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_ASM_KEYWORD = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_MODEL_TUNING = G3; GCC_OPTIMIZATION_LEVEL = 0; @@ -857,13 +874,12 @@ OTHER_REZFLAGS = ""; PRODUCT_NAME = PCSXR; SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; - name = Development; + name = Debug; }; - 71F353F50FD98DFE00CBEC28 /* Deployment */ = { + 71F353F50FD98DFE00CBEC28 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; @@ -871,7 +887,6 @@ GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_ASM_KEYWORD = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_CPU = ""; GCC_MODEL_TUNING = ""; @@ -892,38 +907,41 @@ OTHER_REZFLAGS = ""; PRODUCT_NAME = PCSXR; SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost"; WRAPPER_EXTENSION = app; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 71F353F90FD98DFE00CBEC28 /* Development */ = { + 71F353F90FD98DFE00CBEC28 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + x86_64, + i386, + ); GCC_MODEL_TUNING = ""; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; HEADER_SEARCH_PATHS = ( ../include, ../libpcsxcore, ../macosx, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; - OTHER_LDFLAGS = ( - "-lz", - "-lSystemStubs", - ); - SDKROOT = ""; + OTHER_LDFLAGS = "-lz"; + SDKROOT = macosx10.6; + WARNING_CFLAGS = "-Wall"; }; - name = Development; + name = Debug; }; - 71F353FA0FD98DFE00CBEC28 /* Deployment */ = { + 71F353FA0FD98DFE00CBEC28 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = ( + x86_64, i386, - ppc, ); ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; GCC_DYNAMIC_NO_PIC = YES; @@ -933,21 +951,20 @@ GCC_OPTIMIZATION_LEVEL = 2; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; HEADER_SEARCH_PATHS = ( ../include, ../libpcsxcore, ../macosx, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = "-fomit-frame-pointer"; - OTHER_LDFLAGS = ( - "-lz", - "-lSystemStubs", - ); - SDKROOT = ""; + OTHER_LDFLAGS = "-lz"; + SDKROOT = macosx10.6; + WARNING_CFLAGS = "-Wall"; }; - name = Deployment; + name = Release; }; /* End XCBuildConfiguration section */ @@ -955,20 +972,20 @@ 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSXR" */ = { isa = XCConfigurationList; buildConfigurations = ( - 71F353F40FD98DFE00CBEC28 /* Development */, - 71F353F50FD98DFE00CBEC28 /* Deployment */, + 71F353F40FD98DFE00CBEC28 /* Debug */, + 71F353F50FD98DFE00CBEC28 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsxr" */ = { isa = XCConfigurationList; buildConfigurations = ( - 71F353F90FD98DFE00CBEC28 /* Development */, - 71F353FA0FD98DFE00CBEC28 /* Deployment */, + 71F353F90FD98DFE00CBEC28 /* Debug */, + 71F353FA0FD98DFE00CBEC28 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/macosx/PcsxrController.h b/macosx/PcsxrController.h index f686021f..d1e63c03 100644 --- a/macosx/PcsxrController.h +++ b/macosx/PcsxrController.h @@ -8,13 +8,13 @@ { NSWindowController *preferencesController; NSWindowController *memCardController; - PluginList *pluginList; - + PluginList *pluginList; + IBOutlet NSWindow *memCardWindow; IBOutlet NSWindow *preferenceWindow; - - BOOL sleepInBackground; - BOOL wasPausedBeforeBGSwitch; + + BOOL sleepInBackground; + BOOL wasPausedBeforeBGSwitch; } - (IBAction)ejectCD:(id)sender; - (IBAction)pause:(id)sender; diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m index 83e8c9da..1726d753 100644 --- a/macosx/PcsxrController.m +++ b/macosx/PcsxrController.m @@ -33,14 +33,16 @@ NSString *saveStatePath; [openDlg setCanChooseFiles:YES]; [openDlg setCanChooseDirectories:NO]; - if ([openDlg runModal] == NSOKButton) { + if ([openDlg runModal] == NSFileHandlingPanelOKButton) { NSArray* files = [openDlg filenames]; SetCdOpenCaseTime(time(NULL) + 2); SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]); } } else { - if (CDR_getDriveLetter() != nil) { - deviceName = [NSMutableString stringWithCString:CDR_getDriveLetter()]; + char *driveLetter = CDR_getDriveLetter(); + + if (driveLetter != nil) { + deviceName = [NSMutableString stringWithString:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:driveLetter length:strlen(driveLetter)]]; // delete the 'r' in 'rdisk' rdiskRange = [deviceName rangeOfString:@"rdisk"]; @@ -108,9 +110,9 @@ NSString *saveStatePath; [openDlg setCanChooseFiles:YES]; [openDlg setCanChooseDirectories:NO]; - if ([openDlg runModalForDirectory:nil file:nil] == NSOKButton) { - NSArray* files = [openDlg filenames]; - SetIsoFile((const char *)[[files objectAtIndex:0] fileSystemRepresentation]); + if ([openDlg runModal] == NSFileHandlingPanelOKButton) { + NSArray* urls = [openDlg URLs]; + SetIsoFile((const char *)[[[urls objectAtIndex:0] path] fileSystemRepresentation]); [EmuThread run]; } } @@ -124,14 +126,14 @@ NSString *saveStatePath; - (IBAction)freeze:(id)sender { int num = [sender tag]; - NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, num]; + NSString *path = [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3d.pcsxrstate", CdromId, num]]; [EmuThread freezeAt:path which:num-1]; } - (IBAction)defrost:(id)sender { - NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, [sender tag]]; + NSString *path = [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3d.pcsxrstate", CdromId, [sender tag]]]; [EmuThread defrostAt:path]; } @@ -140,7 +142,7 @@ NSString *saveStatePath; GPU_keypressed(GPU_FULLSCREEN_KEY); } -- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { if ([menuItem action] == @selector(pause:)) { [menuItem setState:([EmuThread isPaused] ? NSOnState : NSOffState)]; @@ -169,7 +171,7 @@ NSString *saveStatePath; if (![EmuThread active] || [EmuThread isRunBios]) return NO; - NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, [menuItem tag]]; + NSString *path = [saveStatePath stringByAppendingPathComponent:[NSString stringWithFormat:@"%s-%3.3d.pcsxrstate", CdromId, [menuItem tag]]]; return (CheckState((char *)[path fileSystemRepresentation]) == 0); } @@ -284,7 +286,7 @@ NSString *saveStatePath; char *str = (char *)[[prefStringKeys objectForKey:defaultKey] pointerValue]; if (str) { - [defaults setObject:[NSString stringWithCString:str] forKey:defaultKey]; + [defaults setObject:[NSString stringWithCString:str encoding:NSUTF8StringEncoding] forKey:defaultKey]; return; } @@ -340,51 +342,44 @@ NSString *saveStatePath; nil]; // setup application support paths - NSArray *libPaths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES); - if ([libPaths count] > 0) { - NSString *path; + NSFileManager *manager = [NSFileManager defaultManager]; + NSURL *supportURL = [manager URLForDirectory:NSApplicationSupportDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:NULL]; + + if(supportURL != nil) { + NSURL *url; BOOL dir; // create them if needed - NSFileManager *dfm = [NSFileManager defaultManager]; - NSString *supportPath = [NSString stringWithFormat:@"%@/Application Support", [libPaths objectAtIndex:0]]; - if (![dfm fileExistsAtPath:supportPath isDirectory:&dir]) - [dfm createDirectoryAtPath:supportPath attributes:nil]; - - path = [NSString stringWithFormat:@"%@/Pcsxr", supportPath]; - if (![dfm fileExistsAtPath:path isDirectory:&dir]) - [dfm createDirectoryAtPath:path attributes:nil]; - - path = [NSString stringWithFormat:@"%@/Pcsxr/Bios", supportPath]; - if (![dfm fileExistsAtPath:path isDirectory:&dir]) - [dfm createDirectoryAtPath:path attributes:nil]; - - path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards", supportPath]; - if (![dfm fileExistsAtPath:path isDirectory:&dir]) - [dfm createDirectoryAtPath:path attributes:nil]; - - path = [NSString stringWithFormat:@"%@/Pcsxr/Patches", supportPath]; - if (![dfm fileExistsAtPath:path isDirectory:&dir]) - [dfm createDirectoryAtPath:path attributes:nil]; - - saveStatePath = [[NSString stringWithFormat:@"%@/Pcsxr/Save States", supportPath] retain]; - if (![dfm fileExistsAtPath:saveStatePath isDirectory:&dir]) - [dfm createDirectoryAtPath:saveStatePath attributes:nil]; - - path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards/Mcd001.mcr", supportPath]; - str = [path fileSystemRepresentation]; + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Bios"]; + if (![url checkResourceIsReachableAndReturnError:NULL]) + [manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL]; + + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Memory Cards"]; + if (![url checkResourceIsReachableAndReturnError:NULL]) + [manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL]; + + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Patches"]; + if (![url checkResourceIsReachableAndReturnError:NULL]) + [manager createDirectoryAtPath:[url path] withIntermediateDirectories:YES attributes:nil error:NULL]; + + saveStatePath = [[[supportURL URLByAppendingPathComponent:@"Pcsxr/Save States"] path] copy]; + if (![manager fileExistsAtPath:saveStatePath isDirectory:&dir]) + [manager createDirectoryAtPath:saveStatePath withIntermediateDirectories:YES attributes:nil error:NULL]; + + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Memory Cards/Mcd001.mcr"]; + str = [[url path] fileSystemRepresentation]; if (str != nil) strncpy(Config.Mcd1, str, 255); - path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards/Mcd002.mcr", supportPath]; - str = [path fileSystemRepresentation]; + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Memory Cards/Mcd002.mcr"]; + str = [[url path] fileSystemRepresentation]; if (str != nil) strncpy(Config.Mcd2, str, 255); - path = [NSString stringWithFormat:@"%@/Pcsxr/Bios/", supportPath]; - str = [path fileSystemRepresentation]; + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Bios"]; + str = [[url path] fileSystemRepresentation]; if (str != nil) strncpy(Config.BiosDir, str, 255); - path = [NSString stringWithFormat:@"%@/Pcsxr/Patches/", supportPath]; - str = [path fileSystemRepresentation]; + url = [supportURL URLByAppendingPathComponent:@"Pcsxr/Patches"]; + str = [[url path] fileSystemRepresentation]; if (str != nil) strncpy(Config.PatchesDir, str, 255); } else { strcpy(Config.BiosDir, "Bios/"); @@ -395,19 +390,20 @@ NSString *saveStatePath; } // set plugin path - path = [[[NSBundle mainBundle] builtInPlugInsPath] stringByAppendingString:@"/"]; + path = [[NSBundle mainBundle] builtInPlugInsPath]; str = [path fileSystemRepresentation]; if (str != nil) strncpy(Config.PluginsDir, str, 255); // locate a bios biosList = [[NSMutableArray alloc] init]; - NSFileManager *manager = [NSFileManager defaultManager]; - NSArray *bioses = [manager directoryContentsAtPath:[NSString stringWithCString:Config.BiosDir]]; + + NSString *biosDir = [manager stringWithFileSystemRepresentation:Config.BiosDir length:strlen(Config.BiosDir)]; + NSArray *bioses = [manager contentsOfDirectoryAtPath:biosDir error:NULL]; if (bioses) { - int i; + NSUInteger i; for (i = 0; i < [bioses count]; i++) { NSString *file = [bioses objectAtIndex:i]; - NSDictionary *attrib = [manager fileAttributesAtPath:[NSString stringWithFormat:@"%s%@", Config.BiosDir, file] traverseLink:YES]; + NSDictionary *attrib = [manager attributesOfItemAtPath:[[biosDir stringByAppendingPathComponent:file] stringByResolvingSymlinksInPath] error:NULL]; if ([[attrib fileType] isEqualToString:NSFileTypeRegular]) { unsigned long long size = [attrib fileSize]; diff --git a/macosx/PcsxrPlugin.h b/macosx/PcsxrPlugin.h index d17dc54e..866dfae5 100644 --- a/macosx/PcsxrPlugin.h +++ b/macosx/PcsxrPlugin.h @@ -10,7 +10,7 @@ @interface PcsxrPlugin : NSObject { - CFBundleRef pluginRef; + void *pluginRef; NSString *path; NSDate *modDate; diff --git a/macosx/PcsxrPlugin.m b/macosx/PcsxrPlugin.m index b112a5ed..c80a0cd7 100644 --- a/macosx/PcsxrPlugin.m +++ b/macosx/PcsxrPlugin.m @@ -72,7 +72,7 @@ pluginRef = nil; name = nil; path = [aPath retain]; - NSString *fullPath = [[NSString stringWithCString:Config.PluginsDir] stringByAppendingPathComponent:path]; + NSString *fullPath = [[[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)] stringByAppendingPathComponent:path]; pluginRef = SysLoadLibrary([fullPath fileSystemRepresentation]); if (pluginRef == nil) { @@ -105,7 +105,7 @@ PSE_getLibName = (PSEgetLibName) SysLoadSym(pluginRef, "PSEgetLibName"); if (SysLibError() == nil) { - name = [[NSString alloc] initWithCString:PSE_getLibName()]; + name = [[NSString alloc] initWithCString:PSE_getLibName() encoding:NSUTF8StringEncoding]; } PSE_getLibVersion = (PSEgetLibVersion) SysLoadSym(pluginRef, "PSEgetLibVersion"); @@ -117,7 +117,7 @@ } // save the current modification date - NSDictionary *fattrs = [[NSFileManager defaultManager] fileAttributesAtPath:fullPath traverseLink:YES]; + NSDictionary *fattrs = [[NSFileManager defaultManager] attributesOfItemAtPath:[fullPath stringByResolvingSymlinksInPath] error:NULL]; modDate = [[fattrs fileModificationDate] retain]; active = 0; @@ -150,7 +150,7 @@ NSString *funcName = [arg objectAtIndex:0]; long (*func)(void); - func = SysLoadSym(pluginRef, [funcName lossyCString]); + func = SysLoadSym(pluginRef, [funcName cStringUsingEncoding:NSUTF8StringEncoding]); if (SysLibError() == nil) { func(); } else { @@ -165,7 +165,7 @@ - (long)initAs:(int)aType { char symbol[255]; - long (*init)(void); + long (*init)(); long (*initArg)(long arg); int res = PSE_ERR_FATAL; @@ -173,7 +173,7 @@ return 0; } - sprintf(symbol, "%sinit", [[PcsxrPlugin getPrefixForType:aType] lossyCString]); + sprintf(symbol, "%sinit", [[PcsxrPlugin getPrefixForType:aType] cStringUsingEncoding:NSUTF8StringEncoding]); init = initArg = SysLoadSym(pluginRef, symbol); if (SysLibError() == nil) { if (aType != PSE_LT_PAD) @@ -198,7 +198,7 @@ char symbol[255]; long (*shutdown)(void); - sprintf(symbol, "%sshutdown", [[PcsxrPlugin getPrefixForType:aType] lossyCString]); + sprintf(symbol, "%sshutdown", [[PcsxrPlugin getPrefixForType:aType] cStringUsingEncoding:NSUTF8StringEncoding]); shutdown = SysLoadSym(pluginRef, symbol); if (SysLibError() == nil) { active &= ~aType; @@ -212,7 +212,7 @@ { char symbol[255]; - sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] lossyCString]); + sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] cStringUsingEncoding:NSUTF8StringEncoding]); SysLoadSym(pluginRef, symbol); return (SysLibError() == nil); @@ -222,7 +222,7 @@ { char symbol[255]; - sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] lossyCString]); + sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] cStringUsingEncoding:NSUTF8StringEncoding]); SysLoadSym(pluginRef, symbol); return (SysLibError() == nil); @@ -233,8 +233,8 @@ NSArray *arg; char symbol[255]; - sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] lossyCString]); - arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol], + sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] cStringUsingEncoding:NSUTF8StringEncoding]); + arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol encoding:NSUTF8StringEncoding], [NSNumber numberWithInt:0], nil]; // detach a new thread @@ -247,8 +247,8 @@ NSArray *arg; char symbol[255]; - sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] lossyCString]); - arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol], + sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] cStringUsingEncoding:NSUTF8StringEncoding]); + arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol encoding:NSUTF8StringEncoding], [NSNumber numberWithInt:1], nil]; // detach a new thread @@ -292,11 +292,11 @@ { // check that the file is still there with the same modification date NSFileManager *dfm = [NSFileManager defaultManager]; - NSString *fullPath = [[NSString stringWithCString:Config.PluginsDir] stringByAppendingPathComponent:path]; + NSString *fullPath = [[dfm stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)] stringByAppendingPathComponent:path]; if (![dfm fileExistsAtPath:fullPath]) return NO; - NSDictionary *fattrs = [dfm fileAttributesAtPath:fullPath traverseLink:YES]; + NSDictionary *fattrs = [dfm attributesOfItemAtPath:[fullPath stringByResolvingSymlinksInPath] error:NULL]; return [[fattrs fileModificationDate] isEqualToDate:modDate]; } diff --git a/macosx/PluginController.m b/macosx/PluginController.m index d9858fae..3dd6fab6 100644 --- a/macosx/PluginController.m +++ b/macosx/PluginController.m @@ -46,7 +46,7 @@ - (void)setPluginsTo:(NSArray *)list withType:(int)type { NSString *sel; - int i; + NSUInteger i; // remember the list pluginType = type; diff --git a/macosx/PluginList.m b/macosx/PluginList.m index 3df8ea4d..53422b49 100644 --- a/macosx/PluginList.m +++ b/macosx/PluginList.m @@ -35,7 +35,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; plugins = [[NSMutableArray alloc] initWithCapacity: 20]; - dir = [NSString stringWithCString:Config.PluginsDir]; + dir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)]; dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:dir]; while (pname = [dirEnum nextObject]) { @@ -87,7 +87,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; - (id)init { - int i; + NSUInteger i; if (!(self = [super init])) return nil; @@ -98,7 +98,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = nil; missingPlugins = NO; - for (i=0; i<sizeof(*typeList); i++) { + for (i = 0; i < sizeof(*typeList); i++) { NSString *path = [defaults stringForKey:[PcsxrPlugin getDefaultKeyForType:typeList[i]]]; if (nil == path) { missingPlugins = YES; @@ -147,7 +147,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; { NSDirectoryEnumerator *dirEnum; NSString *pname, *dir; - int i; + NSUInteger i; // verify that the ones that are in list still works for (i=0; i<[pluginList count]; i++) { @@ -157,10 +157,10 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; } // look for new ones in the plugin directory - dir = [NSString stringWithCString:Config.PluginsDir]; + dir = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:Config.PluginsDir length:strlen(Config.PluginsDir)]; dirEnum = [[NSFileManager defaultManager] enumeratorAtPath:dir]; - while (pname = [dirEnum nextObject]) { + while ((pname = [dirEnum nextObject])) { if ([[pname pathExtension] isEqualToString:@"psxplugin"] || [[pname pathExtension] isEqualToString:@"so"]) { [dirEnum skipDescendents]; /* don't enumerate this @@ -181,7 +181,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; PcsxrPlugin *plugin = [self activePluginForType:typeList[i]]; if (nil == plugin) { NSArray *list = [self pluginsForType:typeList[i]]; - int j; + NSUInteger j; for (j=0; j<[list count]; j++) { if ([self setActivePlugin:[list objectAtIndex:j] forType:typeList[i]]) @@ -196,7 +196,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; - (NSArray *)pluginsForType:(int)typeMask { NSMutableArray *types = [NSMutableArray array]; - int i; + NSUInteger i; for (i=0; i<[pluginList count]; i++) { PcsxrPlugin *plugin = [pluginList objectAtIndex:i]; @@ -214,7 +214,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD}; if (nil == path) return NO; - int i; + NSUInteger i; for (i=0; i<[pluginList count]; i++) { if ([[[pluginList objectAtIndex:i] path] isEqualToString:path]) return YES; diff --git a/macosx/main.m b/macosx/main.m index a8f73b9d..7c730e0c 100644 --- a/macosx/main.m +++ b/macosx/main.m @@ -79,7 +79,7 @@ int SysInit() { LoadMcds(Config.Mcd1, Config.Mcd2); #ifdef USE_POWER_ASSERTION - IOReturn success= IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, &powerAssertion); + IOReturn success= IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR("SysInit()"), &powerAssertion); if (success != kIOReturnSuccess) { NSLog(@"Unable to stop sleep, error code %d", success); } @@ -110,21 +110,21 @@ void SysPrintf(const char *fmt, ...) { void SysMessage(const char *fmt, ...) { va_list list; - char msg[512]; - NSString *locFmtString = NSLocalizedString([NSString stringWithCString:fmt], nil); + NSString *locFmtString = NSLocalizedString([NSString stringWithCString:fmt encoding:NSUTF8StringEncoding], nil); va_start(list, fmt); - vsprintf(msg, [locFmtString lossyCString], list); + NSString *msg = [[NSString alloc] initWithFormat:locFmtString arguments:list]; va_end(list); - - NSRunAlertPanel(NSLocalizedString(@"Error!", nil), - [NSString stringWithCString:msg], - nil, nil, nil); + + NSDictionary *userInfo = [NSDictionary dictionaryWithObject:msg forKey:NSLocalizedFailureReasonErrorKey]; + [NSApp presentError:[NSError errorWithDomain:@"Unknown Domain" code:-1 userInfo:userInfo]]; + + [msg release]; } void *SysLoadLibrary(const char *lib) { - NSBundle *bundle = [NSBundle bundleWithPath:[NSString stringWithCString:lib]]; + NSBundle *bundle = [NSBundle bundleWithPath:[[NSFileManager defaultManager] stringWithFileSystemRepresentation:lib length:strlen(lib)]]; if (bundle != nil) { return dlopen([[bundle executablePath] fileSystemRepresentation], RTLD_LAZY /*RTLD_NOW*/); } diff --git a/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c b/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c index 7d453a9c..0185e94f 100644 --- a/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c +++ b/macosx/plugins/Common/SDL/src/audio/macosx/SDL_coreaudio.c @@ -64,18 +64,21 @@ static void build_device_list(int iscapture, COREAUDIO_DeviceList ** devices, int *devCount) { - Boolean outWritable = 0; OSStatus result = noErr; UInt32 size = 0; - AudioDeviceID *devs = NULL; + AudioObjectPropertyAddress propaddr; + AudioObjectID *devs = NULL; UInt32 i = 0; UInt32 max = 0; free_device_list(devices, devCount); - result = AudioHardwareGetPropertyInfo(kAudioHardwarePropertyDevices, - &size, &outWritable); - + propaddr.mSelector = kAudioHardwarePropertyDevices; + propaddr.mScope = kAudioObjectPropertyScopeGlobal; + propaddr.mElement = kAudioObjectPropertyElementMaster; + + result = AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propaddr, 0, NULL, &size); + if (result != kAudioHardwareNoError) return; @@ -87,33 +90,32 @@ build_device_list(int iscapture, COREAUDIO_DeviceList ** devices, *devices = (COREAUDIO_DeviceList *) SDL_malloc(max * sizeof(**devices)); if (*devices == NULL) return; - - result = AudioHardwareGetProperty(kAudioHardwarePropertyDevices, - &size, devs); + + result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propaddr, 0, NULL, &size, devs); if (result != kAudioHardwareNoError) return; for (i = 0; i < max; i++) { CFStringRef cfstr = NULL; char *ptr = NULL; - AudioDeviceID dev = devs[i]; + AudioObjectID dev = devs[i]; AudioBufferList *buflist = NULL; int usable = 0; CFIndex len = 0; - - result = AudioDeviceGetPropertyInfo(dev, 0, iscapture, - kAudioDevicePropertyStreamConfiguration, - &size, &outWritable); + + propaddr.mSelector = kAudioDevicePropertyStreamConfiguration; + propaddr.mScope = iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; + propaddr.mElement = kAudioObjectPropertyElementMaster; + + result = AudioObjectGetPropertyDataSize(dev, &propaddr, 0, NULL, &size); if (result != noErr) continue; buflist = (AudioBufferList *) SDL_malloc(size); if (buflist == NULL) continue; - - result = AudioDeviceGetProperty(dev, 0, iscapture, - kAudioDevicePropertyStreamConfiguration, - &size, buflist); + + result = AudioObjectGetPropertyData(dev, &propaddr, 0, NULL, &size, buflist); if (result == noErr) { UInt32 j; @@ -124,17 +126,19 @@ build_device_list(int iscapture, COREAUDIO_DeviceList ** devices, } } } - + SDL_free(buflist); - + if (!usable) continue; - + size = sizeof(CFStringRef); - result = AudioDeviceGetProperty(dev, 0, iscapture, - kAudioDevicePropertyDeviceNameCFString, - &size, &cfstr); - + propaddr.mSelector = kAudioDevicePropertyDeviceNameCFString; + propaddr.mScope = iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; + propaddr.mElement = kAudioObjectPropertyElementMaster; + + result = AudioObjectGetPropertyData(dev, &propaddr, 0, NULL, &size, &cfstr); + if (result != kAudioHardwareNoError) continue; @@ -364,20 +368,22 @@ COREAUDIO_CloseDevice(_THIS) static int find_device_by_name(_THIS, const char *devname, int iscapture) { - AudioDeviceID devid = 0; + AudioObjectID devid = 0; + AudioObjectPropertyAddress devaddr; OSStatus result = noErr; UInt32 size = 0; UInt32 alive = 0; pid_t pid = 0; if (devname == NULL) { - size = sizeof(AudioDeviceID); - const AudioHardwarePropertyID propid = - ((iscapture) ? kAudioHardwarePropertyDefaultInputDevice : - kAudioHardwarePropertyDefaultOutputDevice); - - result = AudioHardwareGetProperty(propid, &size, &devid); - CHECK_RESULT("AudioHardwareGetProperty (default device)"); + size = sizeof(devid); + AudioObjectPropertyAddress propaddr; + propaddr.mSelector = ((iscapture) ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice); + propaddr.mScope = kAudioObjectPropertyScopeGlobal; + propaddr.mElement = kAudioObjectPropertyElementMaster; + + result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propaddr, 0, NULL, &size, &devid); + CHECK_RESULT("AudioObjectGetPropertyData (default device)"); } else { if (!find_device_id(devname, iscapture, &devid)) { SDL_SetError("CoreAudio: No such audio device."); @@ -386,9 +392,12 @@ find_device_by_name(_THIS, const char *devname, int iscapture) } size = sizeof(alive); - result = AudioDeviceGetProperty(devid, 0, iscapture, - kAudioDevicePropertyDeviceIsAlive, - &size, &alive); + devaddr.mSelector = kAudioDevicePropertyDeviceIsAlive; + devaddr.mScope = iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; + devaddr.mElement = kAudioObjectPropertyElementMaster; + + result = AudioObjectGetPropertyData(devid, &devaddr, 0, NULL, &size, &alive); + CHECK_RESULT ("AudioDeviceGetProperty (kAudioDevicePropertyDeviceIsAlive)"); @@ -398,8 +407,11 @@ find_device_by_name(_THIS, const char *devname, int iscapture) } size = sizeof(pid); - result = AudioDeviceGetProperty(devid, 0, iscapture, - kAudioDevicePropertyHogMode, &size, &pid); + devaddr.mSelector = kAudioDevicePropertyHogMode; + devaddr.mScope = iscapture ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput; + devaddr.mElement = kAudioObjectPropertyElementMaster; + + result = AudioObjectGetPropertyData(devid, &devaddr, 0, NULL, &size, &pid); /* some devices don't support this property, so errors are fine here. */ if ((result == noErr) && (pid != -1)) { diff --git a/macosx/plugins/Common/SDL/src/haptic/darwin/SDL_syshaptic.c b/macosx/plugins/Common/SDL/src/haptic/darwin/SDL_syshaptic.c index 48a7c45c..9473b794 100644 --- a/macosx/plugins/Common/SDL/src/haptic/darwin/SDL_syshaptic.c +++ b/macosx/plugins/Common/SDL/src/haptic/darwin/SDL_syshaptic.c @@ -90,48 +90,48 @@ static const char * FFStrError(HRESULT err) { switch (err) { - case FFERR_DEVICEFULL: + case (HRESULT)FFERR_DEVICEFULL: return "device full"; /* This should be valid, but for some reason isn't defined... */ /*case FFERR_DEVICENOTREG: return "device not registered"; */ - case FFERR_DEVICEPAUSED: + case (HRESULT)FFERR_DEVICEPAUSED: return "device paused"; - case FFERR_DEVICERELEASED: + case (HRESULT)FFERR_DEVICERELEASED: return "device released"; - case FFERR_EFFECTPLAYING: + case (HRESULT)FFERR_EFFECTPLAYING: return "effect playing"; - case FFERR_EFFECTTYPEMISMATCH: + case (HRESULT)FFERR_EFFECTTYPEMISMATCH: return "effect type mismatch"; - case FFERR_EFFECTTYPENOTSUPPORTED: + case (HRESULT)FFERR_EFFECTTYPENOTSUPPORTED: return "effect type not supported"; - case FFERR_GENERIC: + case (HRESULT)FFERR_GENERIC: return "undetermined error"; - case FFERR_HASEFFECTS: + case (HRESULT)FFERR_HASEFFECTS: return "device has effects"; - case FFERR_INCOMPLETEEFFECT: + case (HRESULT)FFERR_INCOMPLETEEFFECT: return "incomplete effect"; - case FFERR_INTERNAL: + case (HRESULT)FFERR_INTERNAL: return "internal fault"; - case FFERR_INVALIDDOWNLOADID: + case (HRESULT)FFERR_INVALIDDOWNLOADID: return "invalid download id"; - case FFERR_INVALIDPARAM: + case (HRESULT)FFERR_INVALIDPARAM: return "invalid parameter"; - case FFERR_MOREDATA: + case (HRESULT)FFERR_MOREDATA: return "more data"; - case FFERR_NOINTERFACE: + case (HRESULT)FFERR_NOINTERFACE: return "interface not supported"; - case FFERR_NOTDOWNLOADED: + case (HRESULT)FFERR_NOTDOWNLOADED: return "effect is not downloaded"; - case FFERR_NOTINITIALIZED: + case (HRESULT)FFERR_NOTINITIALIZED: return "object has not been initialized"; - case FFERR_OUTOFMEMORY: + case (HRESULT)FFERR_OUTOFMEMORY: return "out of memory"; - case FFERR_UNPLUGGED: + case (HRESULT)FFERR_UNPLUGGED: return "device is unplugged"; - case FFERR_UNSUPPORTED: + case (HRESULT)FFERR_UNSUPPORTED: return "function call unsupported"; - case FFERR_UNSUPPORTEDAXIS: + case (HRESULT)FFERR_UNSUPPORTEDAXIS: return "axis unsupported"; default: @@ -426,7 +426,7 @@ SDL_SYS_HapticOpenFromService(SDL_Haptic * haptic, io_service_t service) /* Get supported features. */ ret2 = GetSupportedFeatures(haptic); - if (haptic->supported < 0) { + if (ret2 < 0) { goto open_err; } diff --git a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj index 1cd551b9..5c470735 100644 --- a/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFCdrom/DFCdrom.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 28586CC614651E870082B8EC /* DFCdromPluginConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28586CC414651E870082B8EC /* DFCdromPluginConfig.xib */; }; 2BD707180555997500CB5D9B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BD707170555997500CB5D9B /* IOKit.framework */; }; 713DB2E811F113C30001BDD4 /* cdr.c in Sources */ = {isa = PBXBuildFile; fileRef = 713DB2E311F113C30001BDD4 /* cdr.c */; }; 713DB2E911F113C30001BDD4 /* cdr.h in Headers */ = {isa = PBXBuildFile; fileRef = 713DB2E411F113C30001BDD4 /* cdr.h */; }; @@ -18,7 +19,6 @@ 71F3C38611F3CFED007B9F12 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F3C38511F3CFED007B9F12 /* AppKit.framework */; }; 71F3C38811F3CFF7007B9F12 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F3C38711F3CFF7007B9F12 /* Carbon.framework */; }; 71F3C47A11F3D108007B9F12 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 71F3C47811F3D108007B9F12 /* Credits.rtf */; }; - 71F3C49D11F3D2B3007B9F12 /* DFCdromPluginConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */; }; 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; }; 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; }; /* End PBXBuildFile section */ @@ -26,18 +26,18 @@ /* Begin PBXFileReference section */ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 28586CC514651E870082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DFCdromPluginConfig.xib; sourceTree = "<group>"; }; 2BD707170555997500CB5D9B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; - 713DB2E311F113C30001BDD4 /* cdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cdr.c; path = ../../../plugins/dfcdrom/cdr.c; sourceTree = SOURCE_ROOT; }; + 713DB2E311F113C30001BDD4 /* cdr.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = cdr.c; path = ../../../plugins/dfcdrom/cdr.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 713DB2E411F113C30001BDD4 /* cdr.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cdr.h; path = ../../../plugins/dfcdrom/cdr.h; sourceTree = SOURCE_ROOT; }; - 713DB2E611F113C30001BDD4 /* util.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = util.c; path = ../../../plugins/dfcdrom/util.c; sourceTree = SOURCE_ROOT; }; - 71F3C32411F3CD0B007B9F12 /* cdr-macosx.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = "cdr-macosx.c"; path = "macsrc/cdr-macosx.c"; sourceTree = "<group>"; }; + 713DB2E611F113C30001BDD4 /* util.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = util.c; path = ../../../plugins/dfcdrom/util.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; + 71F3C32411F3CD0B007B9F12 /* cdr-macosx.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = "cdr-macosx.c"; path = "macsrc/cdr-macosx.c"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 71F3C32511F3CD0B007B9F12 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cfg.c; path = macsrc/cfg.c; sourceTree = "<group>"; }; 71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PluginConfigController.h; path = macsrc/PluginConfigController.h; sourceTree = "<group>"; }; 71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PluginConfigController.m; path = macsrc/PluginConfigController.m; sourceTree = "<group>"; }; 71F3C38511F3CFED007B9F12 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 71F3C38711F3CFF7007B9F12 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 71F3C47911F3D108007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; - 71F3C49C11F3D2B3007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/DFCdromPluginConfig.nib; sourceTree = "<group>"; }; 8D576316048677EA00EA77CD /* DFCdrom.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFCdrom.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -82,7 +82,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( - 71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */, + 28586CC414651E870082B8EC /* DFCdromPluginConfig.xib */, 71F3C47811F3D108007B9F12 /* Credits.rtf */, 8D576317048677EA00EA77CD /* Info.plist */, 8D5B49A704867FD3000E48DA /* InfoPlist.strings */, @@ -168,8 +168,11 @@ /* Begin PBXProject section */ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFCdrom" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -194,7 +197,7 @@ files = ( 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */, 71F3C47A11F3D108007B9F12 /* Credits.rtf in Resources */, - 71F3C49D11F3D2B3007B9F12 /* DFCdromPluginConfig.nib in Resources */, + 28586CC614651E870082B8EC /* DFCdromPluginConfig.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -226,20 +229,20 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 71F3C47811F3D108007B9F12 /* Credits.rtf */ = { + 28586CC414651E870082B8EC /* DFCdromPluginConfig.xib */ = { isa = PBXVariantGroup; children = ( - 71F3C47911F3D108007B9F12 /* English */, + 28586CC514651E870082B8EC /* English */, ); - name = Credits.rtf; + name = DFCdromPluginConfig.xib; sourceTree = "<group>"; }; - 71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */ = { + 71F3C47811F3D108007B9F12 /* Credits.rtf */ = { isa = PBXVariantGroup; children = ( - 71F3C49C11F3D2B3007B9F12 /* English */, + 71F3C47911F3D108007B9F12 /* English */, ); - name = DFCdromPluginConfig.nib; + name = Credits.rtf; sourceTree = "<group>"; }; 8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = { @@ -253,7 +256,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 7107359A0FDEED75004AD098 /* Development */ = { + 7107359A0FDEED75004AD098 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -280,15 +283,14 @@ ); WRAPPER_EXTENSION = psxplugin; }; - name = Development; + name = Debug; }; - 7107359B0FDEED75004AD098 /* Deployment */ = { + 7107359B0FDEED75004AD098 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; DEBUGGING_SYMBOLS = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; @@ -312,46 +314,54 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 7107359F0FDEED75004AD098 /* Development */ = { + 7107359F0FDEED75004AD098 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; + ARCHS = ( + i386, + x86_64, + ); GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( ../../../libpcsxcore, ../.., ../../../plugins/dfcdrom, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx10.6; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Development; + name = Debug; }; - 710735A00FDEED75004AD098 /* Deployment */ = { + 710735A00FDEED75004AD098 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = ( i386, - ppc, + x86_64, ); GCC_MODEL_TUNING = ""; GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( ../../../libpcsxcore, ../.., ../../../plugins/dfcdrom, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Deployment; + name = Release; }; /* End XCBuildConfiguration section */ @@ -359,20 +369,20 @@ 710735990FDEED75004AD098 /* Build configuration list for PBXNativeTarget "DFCdrom" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7107359A0FDEED75004AD098 /* Development */, - 7107359B0FDEED75004AD098 /* Deployment */, + 7107359A0FDEED75004AD098 /* Debug */, + 7107359B0FDEED75004AD098 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFCdrom" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7107359F0FDEED75004AD098 /* Development */, - 710735A00FDEED75004AD098 /* Deployment */, + 7107359F0FDEED75004AD098 /* Debug */, + 710735A00FDEED75004AD098 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/classes.nib b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/classes.nib index b1e8f6c7..e69de29b 100644 --- a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/classes.nib +++ b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/classes.nib @@ -1,18 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {cancel = id; ok = id; }; - CLASS = DFCdromPluginConfigController; - LANGUAGE = ObjC; - OUTLETS = {CacheSize = NSSlider; Cached = NSControl; CdSpeed = NSPopUpButton; }; - SUPERCLASS = NSWindowController; - }, - { - ACTIONS = {"" = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/info.nib b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/info.nib index f90f50b0..e69de29b 100644 --- a/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/info.nib +++ b/macosx/plugins/DFCdrom/English.lproj/DFCdromPluginConfig.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>117 49 561 249 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> - <key>IBSystem Version</key> - <string>8P2137</string> -</dict> -</plist> diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m index 86146a24..5cafc70d 100644 --- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m @@ -135,7 +135,7 @@ void ReadConfig() // load from preferences [keyValues release]; - keyValues = [[defaults dictionaryForKey:PrefsKey] retain]; + keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; [Cached setIntValue:[[keyValues objectForKey:@"Threaded"] intValue]]; [CacheSize setIntValue:[[keyValues objectForKey:@"Cache Size"] intValue]]; diff --git a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj index 683ca520..fc68b0a0 100644 --- a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj @@ -3,10 +3,11 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 28586CC314651E730082B8EC /* NetPcsxrHIDInputPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28586CC114651E730082B8EC /* NetPcsxrHIDInputPluginMain.xib */; }; 2B679862069193F300E2BD4F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B679860069193F300E2BD4F /* Cocoa.framework */; }; 2B679863069193F300E2BD4F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B679861069193F300E2BD4F /* IOKit.framework */; }; 71054E211204A49F00AC2CCB /* ForceFeedback.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71054E201204A49F00AC2CCB /* ForceFeedback.framework */; }; @@ -63,7 +64,6 @@ 71D88862130F032700F150FF /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71D8882C130F032700F150FF /* SDL_error_c.h */; }; 71E861B611FF75AC001C1826 /* PadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861AC11FF75AC001C1826 /* PadView.h */; }; 71E861B711FF75AC001C1826 /* PadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861AD11FF75AC001C1826 /* PadView.m */; }; - 71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */; }; 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; }; 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; }; /* End PBXBuildFile section */ @@ -71,16 +71,17 @@ /* Begin PBXFileReference section */ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 28586CC214651E730082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.xib; sourceTree = "<group>"; }; 2B679860069193F300E2BD4F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 2B679861069193F300E2BD4F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; }; 71054E201204A49F00AC2CCB /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = "<absolute>"; }; 7136F51912011BB4001973D9 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; - 714FA82A11FC822A00517F47 /* analog.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = analog.c; path = ../../../plugins/dfinput/analog.c; sourceTree = SOURCE_ROOT; }; + 714FA82A11FC822A00517F47 /* analog.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = analog.c; path = ../../../plugins/dfinput/analog.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 714FA82B11FC822A00517F47 /* pad.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = pad.c; path = ../../../plugins/dfinput/pad.c; sourceTree = SOURCE_ROOT; }; 714FA82C11FC822A00517F47 /* pad.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = pad.h; path = ../../../plugins/dfinput/pad.h; sourceTree = SOURCE_ROOT; }; 714FA82D11FC822A00517F47 /* sdljoy.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = sdljoy.c; path = ../../../plugins/dfinput/sdljoy.c; sourceTree = SOURCE_ROOT; }; 714FA89F11FC846800517F47 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; - 714FA8F811FC863500517F47 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cfg.c; path = macsrc/cfg.c; sourceTree = "<group>"; }; + 714FA8F811FC863500517F47 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = cfg.c; path = macsrc/cfg.c; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 714FA8F911FC863500517F47 /* xkb.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = xkb.c; path = macsrc/xkb.c; sourceTree = "<group>"; }; 7192EAAB1200D54500038B92 /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = macsrc/cfg.h; sourceTree = "<group>"; }; 71C7B252130F3904004BF975 /* SDL_syscond.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = SDL_syscond.c; path = ../Common/SDL/src/thread/pthread/SDL_syscond.c; sourceTree = SOURCE_ROOT; }; @@ -108,7 +109,7 @@ 71D88806130F032700F150FF /* SDL_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = SDL_stdinc.h; path = ../Common/SDL/include/SDL_stdinc.h; sourceTree = SOURCE_ROOT; }; 71D88807130F032700F150FF /* SDL_thread.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = SDL_thread.h; path = ../Common/SDL/include/SDL_thread.h; sourceTree = SOURCE_ROOT; }; 71D8881F130F032700F150FF /* SDL_syshaptic.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = SDL_syshaptic.c; path = ../Common/SDL/src/haptic/darwin/SDL_syshaptic.c; sourceTree = SOURCE_ROOT; }; - 71D88820130F032700F150FF /* SDL_haptic.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = SDL_haptic.c; path = ../Common/SDL/src/haptic/SDL_haptic.c; sourceTree = SOURCE_ROOT; }; + 71D88820130F032700F150FF /* SDL_haptic.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = SDL_haptic.c; path = ../Common/SDL/src/haptic/SDL_haptic.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 71D88821130F032700F150FF /* SDL_haptic_c.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = SDL_haptic_c.h; path = ../Common/SDL/src/haptic/SDL_haptic_c.h; sourceTree = SOURCE_ROOT; }; 71D88822130F032700F150FF /* SDL_syshaptic.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = SDL_syshaptic.h; path = ../Common/SDL/src/haptic/SDL_syshaptic.h; sourceTree = SOURCE_ROOT; }; 71D88825130F032700F150FF /* SDL_sysjoystick.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = SDL_sysjoystick.c; path = ../Common/SDL/src/joystick/darwin/SDL_sysjoystick.c; sourceTree = SOURCE_ROOT; }; @@ -127,7 +128,6 @@ 71E861AB11FF75AC001C1826 /* PadController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadController.m; path = macsrc/PadController.m; sourceTree = "<group>"; }; 71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = "<group>"; }; 71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = "<group>"; }; - 71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.nib; sourceTree = "<group>"; }; 8D576316048677EA00EA77CD /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -177,7 +177,7 @@ isa = PBXGroup; children = ( 7136F51812011BB4001973D9 /* Credits.rtf */, - 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */, + 28586CC114651E730082B8EC /* NetPcsxrHIDInputPluginMain.xib */, 8D576317048677EA00EA77CD /* Info.plist */, 8D5B49A704867FD3000E48DA /* InfoPlist.strings */, ); @@ -406,8 +406,11 @@ /* Begin PBXProject section */ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 71155B110FDFA2DE00EC0BC5 /* Build configuration list for PBXProject "DFInput" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -431,8 +434,8 @@ buildActionMask = 2147483647; files = ( 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */, - 71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */, 7136F51A12011BB4001973D9 /* Credits.rtf in Resources */, + 28586CC314651E730082B8EC /* NetPcsxrHIDInputPluginMain.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -479,20 +482,20 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 7136F51812011BB4001973D9 /* Credits.rtf */ = { + 28586CC114651E730082B8EC /* NetPcsxrHIDInputPluginMain.xib */ = { isa = PBXVariantGroup; children = ( - 7136F51912011BB4001973D9 /* English */, + 28586CC214651E730082B8EC /* English */, ); - name = Credits.rtf; + name = NetPcsxrHIDInputPluginMain.xib; sourceTree = "<group>"; }; - 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */ = { + 7136F51812011BB4001973D9 /* Credits.rtf */ = { isa = PBXVariantGroup; children = ( - 71E861BB11FF75BA001C1826 /* English */, + 7136F51912011BB4001973D9 /* English */, ); - name = NetPcsxrHIDInputPluginMain.nib; + name = Credits.rtf; sourceTree = "<group>"; }; 8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = { @@ -506,7 +509,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 71155B0D0FDFA2DE00EC0BC5 /* Development */ = { + 71155B0D0FDFA2DE00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -543,15 +546,14 @@ ); WRAPPER_EXTENSION = psxplugin; }; - name = Development; + name = Debug; }; - 71155B0E0FDFA2DE00EC0BC5 /* Deployment */ = { + 71155B0E0FDFA2DE00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; DEBUGGING_SYMBOLS = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; @@ -584,14 +586,19 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 71155B120FDFA2DE00EC0BC5 /* Development */ = { + 71155B120FDFA2DE00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + i386, + x86_64, + ); GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( ../../../libpcsxcore, ../.., @@ -600,23 +607,26 @@ ../../../../plugins/dfinput, ../Common/SDL/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; - SDKROOT = ""; + SDKROOT = macosx10.6; STRIP_INSTALLED_PRODUCT = NO; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Development; + name = Debug; }; - 71155B130FDFA2DE00EC0BC5 /* Deployment */ = { + 71155B130FDFA2DE00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = ( i386, - ppc, + x86_64, ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1"; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( ../../../libpcsxcore, ../.., @@ -625,12 +635,13 @@ ../../../../plugins/dfinput, ../Common/SDL/include, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = ""; - SDKROOT = ""; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Deployment; + name = Release; }; /* End XCBuildConfiguration section */ @@ -638,20 +649,20 @@ 71155B0C0FDFA2DE00EC0BC5 /* Build configuration list for PBXNativeTarget "DFInput" */ = { isa = XCConfigurationList; buildConfigurations = ( - 71155B0D0FDFA2DE00EC0BC5 /* Development */, - 71155B0E0FDFA2DE00EC0BC5 /* Deployment */, + 71155B0D0FDFA2DE00EC0BC5 /* Debug */, + 71155B0E0FDFA2DE00EC0BC5 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 71155B110FDFA2DE00EC0BC5 /* Build configuration list for PBXProject "DFInput" */ = { isa = XCConfigurationList; buildConfigurations = ( - 71155B120FDFA2DE00EC0BC5 /* Development */, - 71155B130FDFA2DE00EC0BC5 /* Deployment */, + 71155B120FDFA2DE00EC0BC5 /* Debug */, + 71155B130FDFA2DE00EC0BC5 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/classes.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/classes.nib index 3d81880b..e69de29b 100644 --- a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/classes.nib +++ b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/classes.nib @@ -1,33 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - CLASS = NetPcsxHIDInputPluginMappingCell; - LANGUAGE = ObjC; - SUPERCLASS = NSTextFieldCell; - }, - { - ACTIONS = {cancel = id; ok = id; setKey = id; }; - CLASS = NetPcsxrHIDInputPluginPadController; - LANGUAGE = ObjC; - OUTLETS = { - controllerView = NetPcsxrHIDInputPluginPadView; - controllerView1 = id; - controllerView2 = id; - }; - SUPERCLASS = NSWindowController; - }, - { - ACTIONS = {setDevice = id; setType = id; }; - CLASS = NetPcsxrHIDInputPluginPadView; - LANGUAGE = ObjC; - OUTLETS = { - deviceMenu = NSPopUpButton; - tableView = NSTableView; - typeMenu = NSPopUpButton; - }; - SUPERCLASS = NSView; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/info.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/info.nib index 27f6df15..e69de29b 100644 --- a/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/info.nib +++ b/macosx/plugins/DFInput/English.lproj/NetPcsxrHIDInputPluginMain.nib/info.nib @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>54 67 576 240 0 0 1024 746 </string> - <key>IBEditorPositions</key> - <dict> - <key>16</key> - <string>293 323 437 378 0 0 1024 746 </string> - </dict> - <key>IBFramework Version</key> - <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>16</integer> - </array> - <key>IBSystem Version</key> - <string>8P2137</string> -</dict> -</plist> diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h index af0d0407..671c51ff 100644 --- a/macosx/plugins/DFInput/macsrc/ControllerList.h +++ b/macosx/plugins/DFInput/macsrc/ControllerList.h @@ -21,13 +21,12 @@ #define ControllerList NetPcsxrHIDInputPluginControllerList -#import <Foundation/Foundation.h> -#import <AppKit/NSTableView.h> +#import <Cocoa/Cocoa.h> #include "cfg.h" @class KeyConfig; -@interface ControllerList : NSObject { +@interface ControllerList : NSObject <NSTableViewDataSource> { } - (id)initWithConfig; diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.m b/macosx/plugins/DFInput/macsrc/MappingCell.m index 2a382436..48e5dfe5 100644 --- a/macosx/plugins/DFInput/macsrc/MappingCell.m +++ b/macosx/plugins/DFInput/macsrc/MappingCell.m @@ -31,7 +31,7 @@ return self; } -- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(long)selStart length:(long)selLength +- (void)selectWithFrame:(NSRect)aRect inView:(NSView *)controlView editor:(NSText *)textObj delegate:(id)anObject start:(NSInteger)selStart length:(NSInteger)selLength { [super selectWithFrame:aRect inView:controlView editor:textObj delegate:anObject start:selStart length:selLength]; @@ -74,7 +74,7 @@ [tableView deselectAll:self]; return; } - [tableView selectRow:nextRow byExtendingSelection:NO]; + [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:nextRow] byExtendingSelection:NO]; /* discard any events we have received while waiting for the button press */ endEvent = [NSEvent otherEventWithType:NSApplicationDefined location:where diff --git a/macosx/plugins/DFInput/macsrc/cfg.c b/macosx/plugins/DFInput/macsrc/cfg.c index f251996d..3e0ee1d5 100644 --- a/macosx/plugins/DFInput/macsrc/cfg.c +++ b/macosx/plugins/DFInput/macsrc/cfg.c @@ -672,7 +672,7 @@ int ReadDKeyEvent(int padnum, int key) { } // check mouse events - if (Button()) { + if (GetCurrentButtonState()) { changed = 2; goto end; } @@ -755,7 +755,7 @@ int ReadAnalogEvent(int padnum, int analognum, int analogdir) { } // check mouse events - if (Button()) { + if (GetCurrentButtonState()) { changed = 2; goto end; } diff --git a/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/classes.nib b/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/classes.nib index 161b8f0c..e69de29b 100644 --- a/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/classes.nib +++ b/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/classes.nib @@ -1,26 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = {cancel = id; ok = id; reset = id; }; - CLASS = NetSfPeopsSPUPluginController; - LANGUAGE = ObjC; - OUTLETS = { - hiCompBox = NSControl; - interpolValue = NetSfPeopsSPUPluginNamedSlider; - irqWaitBox = NetSfPeopsSPUPluginNamedSlider; - monoSoundBox = NSControl; - reverbValue = NSControl; - volumeValue = NSControl; - xaSpeedBox = NSControl; - }; - SUPERCLASS = NSWindowController; - }, - { - CLASS = NetSfPeopsSPUPluginNamedSlider; - LANGUAGE = ObjC; - SUPERCLASS = NSSlider; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/info.nib b/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/info.nib index 27b0ed6d..e69de29b 100644 --- a/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/info.nib +++ b/macosx/plugins/DFSound/English.lproj/NetSfPeopsSpuPluginMain.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>42 12 546 240 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>442.0</string> - <key>IBOpenObjects</key> - <array> - <integer>6</integer> - </array> - <key>IBSystem Version</key> - <string>8F1099</string> -</dict> -</plist> diff --git a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj index 7b058e62..b037fff2 100644 --- a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj @@ -3,18 +3,18 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 2B4F9962077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */; }; + 28F0C3A214651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3A014651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib */; }; + 28F0C3A314651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F0C3A014651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib */; }; 2B4F99F9077B0CE4004E36BA /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F99F7077B0CE4004E36BA /* Credits.rtf */; }; 2B7B2B94072D9BE6007F0C35 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2B92072D9BE6007F0C35 /* PluginController.m */; }; 2B7B2BD1072DAE5D007F0C35 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */; }; 2B7B2BE9072DB1B6007F0C35 /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; }; 2BFF7F3E0715D2E00061278A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BFF7F3D0715D2E00061278A /* Carbon.framework */; }; 5599693813AFCD2900B0216B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; }; - 5599693913AFCD2900B0216B /* NetSfPeopsSpuPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */; }; 5599693A13AFCD2900B0216B /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2B4F99F7077B0CE4004E36BA /* Credits.rtf */; }; 5599693C13AFCD2900B0216B /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2B92072D9BE6007F0C35 /* PluginController.m */; }; 5599693D13AFCD2900B0216B /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; }; @@ -60,8 +60,9 @@ /* Begin PBXFileReference section */ 089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; + 28E9406D146480AC00BA2A2F /* maccfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maccfg.h; path = macsrc/maccfg.h; sourceTree = "<group>"; }; + 28F0C3A114651EFA00A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.xib; sourceTree = "<group>"; }; 2B4F99F8077B0CE4004E36BA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; - 2B6DA89307200A9A009F6FED /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.nib; sourceTree = "<group>"; }; 2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginController.h; path = macsrc/PluginController.h; sourceTree = "<group>"; }; 2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginController.m; path = macsrc/PluginController.m; sourceTree = "<group>"; }; 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; @@ -71,7 +72,6 @@ 5517C065136217DE00706CCF /* externals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = externals.c; path = ../../../plugins/dfsound/externals.c; sourceTree = SOURCE_ROOT; }; 5599692713AFCCC600B0216B /* openal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openal.c; path = ../../../plugins/dfsound/openal.c; sourceTree = SOURCE_ROOT; }; 5599695E13AFCD2900B0216B /* PeopsAL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsAL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; - 5599695F13AFCD2900B0216B /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; }; 5599696E13AFCE1D00B0216B /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 71C7B1C2130F340E004BF975 /* begin_code.h */ = {isa = PBXFileReference; fileEncoding = 4294967295; lastKnownFileType = sourcecode.c.h; name = begin_code.h; path = ../Common/SDL/include/begin_code.h; sourceTree = SOURCE_ROOT; }; 71C7B1C3130F340E004BF975 /* close_code.h */ = {isa = PBXFileReference; fileEncoding = 4294967295; lastKnownFileType = sourcecode.c.h; name = close_code.h; path = ../Common/SDL/include/close_code.h; sourceTree = SOURCE_ROOT; }; @@ -133,7 +133,7 @@ 71E4E7A1109DC529003BB7AC /* regs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = regs.h; path = ../../../plugins/dfsound/regs.h; sourceTree = SOURCE_ROOT; }; 71E4E7A2109DC529003BB7AC /* reverb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reverb.c; path = ../../../plugins/dfsound/reverb.c; sourceTree = SOURCE_ROOT; }; 71E4E7A3109DC529003BB7AC /* reverb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = reverb.h; path = ../../../plugins/dfsound/reverb.h; sourceTree = SOURCE_ROOT; }; - 71E4E7A4109DC529003BB7AC /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = spu.c; path = ../../../plugins/dfsound/spu.c; sourceTree = SOURCE_ROOT; }; + 71E4E7A4109DC529003BB7AC /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = spu.c; path = ../../../plugins/dfsound/spu.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 71E4E7A5109DC529003BB7AC /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = spu.h; path = ../../../plugins/dfsound/spu.h; sourceTree = SOURCE_ROOT; }; 71E4E7A6109DC529003BB7AC /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stdafx.h; path = ../../../plugins/dfsound/stdafx.h; sourceTree = SOURCE_ROOT; }; 71E4E7A7109DC529003BB7AC /* xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xa.c; path = ../../../plugins/dfsound/xa.c; sourceTree = SOURCE_ROOT; }; @@ -174,7 +174,7 @@ isa = PBXGroup; children = ( 08FB77AFFE84173DC02AAC07 /* Source */, - 2B7B2B8E072D9BD6007F0C35 /* Classes */, + 2B7B2B8E072D9BD6007F0C35 /* macsrc */, 089C167CFE841241C02AAC07 /* Resources */, 71C7B1C0130F340E004BF975 /* SDL */, 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, @@ -203,8 +203,7 @@ 8D576317048677EA00EA77CD /* Info.plist */, 2B4F99F7077B0CE4004E36BA /* Credits.rtf */, 8D5B49A704867FD3000E48DA /* InfoPlist.strings */, - 2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */, - 5599695F13AFCD2900B0216B /* Info copy.plist */, + 28F0C3A014651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib */, ); name = Resources; sourceTree = "<group>"; @@ -249,15 +248,16 @@ name = Products; sourceTree = "<group>"; }; - 2B7B2B8E072D9BD6007F0C35 /* Classes */ = { + 2B7B2B8E072D9BD6007F0C35 /* macsrc */ = { isa = PBXGroup; children = ( + 28E9406D146480AC00BA2A2F /* maccfg.h */, 2B7B2B91072D9BE6007F0C35 /* PluginController.h */, 2B7B2B92072D9BE6007F0C35 /* PluginController.m */, 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */, 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */, ); - name = Classes; + name = macsrc; sourceTree = "<group>"; }; 71C7B1C0130F340E004BF975 /* SDL */ = { @@ -425,8 +425,11 @@ /* Begin PBXProject section */ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 71155B2B0FDFA2EB00EC0BC5 /* Build configuration list for PBXProject "PeopsSPU" */; - compatibilityVersion = "Xcode 3.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -451,8 +454,8 @@ buildActionMask = 2147483647; files = ( 5599693813AFCD2900B0216B /* InfoPlist.strings in Resources */, - 5599693913AFCD2900B0216B /* NetSfPeopsSpuPluginMain.nib in Resources */, 5599693A13AFCD2900B0216B /* Credits.rtf in Resources */, + 28F0C3A314651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -461,8 +464,8 @@ buildActionMask = 2147483647; files = ( 8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */, - 2B4F9962077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib in Resources */, 2B4F99F9077B0CE4004E36BA /* Credits.rtf in Resources */, + 28F0C3A214651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -519,12 +522,12 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ - 2B4F9961077B042E004E36BA /* NetSfPeopsSpuPluginMain.nib */ = { + 28F0C3A014651EFA00A90285 /* NetSfPeopsSpuPluginMain.xib */ = { isa = PBXVariantGroup; children = ( - 2B6DA89307200A9A009F6FED /* English */, + 28F0C3A114651EFA00A90285 /* English */, ); - name = NetSfPeopsSpuPluginMain.nib; + name = NetSfPeopsSpuPluginMain.xib; sourceTree = "<group>"; }; 2B4F99F7077B0CE4004E36BA /* Credits.rtf */ = { @@ -546,7 +549,7 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 5599695C13AFCD2900B0216B /* Development */ = { + 5599695C13AFCD2900B0216B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -572,14 +575,13 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Development; + name = Debug; }; - 5599695D13AFCD2900B0216B /* Deployment */ = { + 5599695D13AFCD2900B0216B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; DEBUGGING_SYMBOLS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; @@ -603,9 +605,9 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 71155B270FDFA2EB00EC0BC5 /* Development */ = { + 71155B270FDFA2EB00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -631,14 +633,13 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Development; + name = Debug; }; - 71155B290FDFA2EB00EC0BC5 /* Deployment */ = { + 71155B290FDFA2EB00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; DEBUGGING_SYMBOLS = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; @@ -662,28 +663,38 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 71155B2C0FDFA2EB00EC0BC5 /* Development */ = { + 71155B2C0FDFA2EB00EC0BC5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ARCHS = ( + x86_64, + i386, + ); + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ""; - SDKROOT = ""; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Development; + name = Debug; }; - 71155B2E0FDFA2EB00EC0BC5 /* Deployment */ = { + 71155B2E0FDFA2EB00EC0BC5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH_ACTUAL)"; + ARCHS = ( + x86_64, + i386, + ); + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; OTHER_CFLAGS = ""; - SDKROOT = ""; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Deployment; + name = Release; }; /* End XCBuildConfiguration section */ @@ -691,29 +702,29 @@ 5599695B13AFCD2900B0216B /* Build configuration list for PBXNativeTarget "PeopsAL" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5599695C13AFCD2900B0216B /* Development */, - 5599695D13AFCD2900B0216B /* Deployment */, + 5599695C13AFCD2900B0216B /* Debug */, + 5599695D13AFCD2900B0216B /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 71155B260FDFA2EB00EC0BC5 /* Build configuration list for PBXNativeTarget "PeopsSPU" */ = { isa = XCConfigurationList; buildConfigurations = ( - 71155B270FDFA2EB00EC0BC5 /* Development */, - 71155B290FDFA2EB00EC0BC5 /* Deployment */, + 71155B270FDFA2EB00EC0BC5 /* Debug */, + 71155B290FDFA2EB00EC0BC5 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 71155B2B0FDFA2EB00EC0BC5 /* Build configuration list for PBXProject "PeopsSPU" */ = { isa = XCConfigurationList; buildConfigurations = ( - 71155B2C0FDFA2EB00EC0BC5 /* Development */, - 71155B2E0FDFA2EB00EC0BC5 /* Deployment */, + 71155B2C0FDFA2EB00EC0BC5 /* Debug */, + 71155B2E0FDFA2EB00EC0BC5 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/macosx/plugins/DFSound/macsrc/PluginController.h b/macosx/plugins/DFSound/macsrc/PluginController.h index 6479c8ba..3de02397 100644 --- a/macosx/plugins/DFSound/macsrc/PluginController.h +++ b/macosx/plugins/DFSound/macsrc/PluginController.h @@ -3,10 +3,6 @@ #import <Cocoa/Cocoa.h> #import "NamedSlider.h" -void DoAbout(); -long DoConfiguration(); -void LoadConfiguration(); - #ifdef USEOPENAL #define PluginController NetSfPeopsALPluginController #else diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m index b5f9fb7b..590ae034 100644 --- a/macosx/plugins/DFSound/macsrc/PluginController.m +++ b/macosx/plugins/DFSound/macsrc/PluginController.m @@ -1,6 +1,7 @@ #import "PluginController.h" #include "stdafx.h" #include "externals.h" +#include "maccfg.h" #ifdef USEOPENAL #define APP_ID @"net.sf.peops.ALPlugin" @@ -137,7 +138,7 @@ void ReadConfig(void) /* load from preferences */ [keyValues release]; - keyValues = [[defaults dictionaryForKey:PrefsKey] retain]; + keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; [hiCompBox setIntValue:[[keyValues objectForKey:@"High Compatibility Mode"] intValue]]; [irqWaitBox setIntValue:[[keyValues objectForKey:@"SPU IRQ Wait"] intValue]]; diff --git a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/classes.nib b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/classes.nib index b94b3c4a..e69de29b 100644 --- a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/classes.nib +++ b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/classes.nib @@ -1,26 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {"" = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = {cancel = id; hackToggle = id; ok = id; reset = id; }; - CLASS = NetSfPeopsSoftGPUPluginConfigController; - LANGUAGE = ObjC; - OUTLETS = { - autoFullScreen = NSControl; - ditherMode = NSPopUpButton; - fpsCounter = NSControl; - frameSkipping = NSControl; - hackEnable = NSControl; - hacksView = NSView; - vSync = NSControl; - }; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/info.nib b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/info.nib index 8dfe3d1d..e69de29b 100644 --- a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/info.nib +++ b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>19 23 561 249 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> - <key>IBSystem Version</key> - <string>8P2137</string> -</dict> -</plist> diff --git a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/classes.nib b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/classes.nib index 78bbc4f7..e69de29b 100644 --- a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/classes.nib +++ b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/classes.nib @@ -1,22 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - CLASS = NetSfPeopsSoftGPUPluginGLView; - LANGUAGE = ObjC; - SUPERCLASS = NSOpenGLView; - }, - { - CLASS = NetSfPeopsSoftGPUPluginWindow; - LANGUAGE = ObjC; - SUPERCLASS = NSWindow; - }, - { - CLASS = NetSfPeopsSoftGPUPluginWindowController; - LANGUAGE = ObjC; - OUTLETS = {glView = NSOpenGLView; }; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/info.nib b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/info.nib index f4ba2521..e69de29b 100644 --- a/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/info.nib +++ b/macosx/plugins/DFXVideo/NetSfPeopsSoftGPUInterface.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>99 26 409 240 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>364.0</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> - <key>IBSystem Version</key> - <string>7S215</string> -</dict> -</plist> diff --git a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj index 8eae399c..c29b0a35 100644 --- a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj @@ -3,20 +3,20 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 28586CC914651E9B0082B8EC /* NetSfPeopsSoftGPUConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28586CC714651E9B0082B8EC /* NetSfPeopsSoftGPUConfig.xib */; }; + 28586CCB14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28586CCA14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib */; }; 2B038C07069183300082466B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2B038C05069183300082466B /* InfoPlist.strings */; }; 2B957EB10635DFE400543905 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B957EAF0635DFE400543905 /* PluginWindow.m */; }; 2B959DC106342C22000F2A2D /* drawgl.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E5D64062B2CC1001D796E /* drawgl.m */; }; 2B959DCD06342C24000F2A2D /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BAF4FCA0632967A00DB9A16 /* PluginGLView.m */; }; 2B959DD506342C25000F2A2D /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E5DF1062B36FB001D796E /* PluginWindowController.m */; }; - 2B959DE106342C31000F2A2D /* NetSfPeopsSoftGPUInterface.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */; }; 2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B959E4306342D32000F2A2D /* OpenGL.framework */; }; 2BB260A90777462E00F6854C /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BB260A70777462E00F6854C /* PluginConfigController.m */; }; 2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E767077AF53E00657C69 /* Credits.rtf */; }; - 2BD2E829077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */; }; 2BD7C777076E1FAB000F05ED /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B51949E06B3D2D200744730 /* GLUT.framework */; }; 71E9EC06109F24E700E98D1D /* fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBF4109F24E600E98D1D /* fps.c */; }; 71E9EC08109F24E700E98D1D /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E9EBF6109F24E600E98D1D /* gpu.c */; }; @@ -28,11 +28,11 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 28586CC814651E9B0082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.xib; sourceTree = "<group>"; }; + 28586CCA14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsSoftGPUInterface.xib; sourceTree = "<group>"; }; 2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; - 2B371FBB0773859200B1DC0B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.nib; sourceTree = "<group>"; }; 2B3E5D64062B2CC1001D796E /* drawgl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = drawgl.m; path = macsrc/drawgl.m; sourceTree = SOURCE_ROOT; }; - 2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = NetSfPeopsSoftGPUInterface.nib; sourceTree = "<group>"; }; 2B3E5DF0062B36FB001D796E /* PluginWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindowController.h; path = macsrc/PluginWindowController.h; sourceTree = SOURCE_ROOT; }; 2B3E5DF1062B36FB001D796E /* PluginWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindowController.m; path = macsrc/PluginWindowController.m; sourceTree = SOURCE_ROOT; }; 2B51949E06B3D2D200744730 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; @@ -85,7 +85,6 @@ 71E9EBF0109F24B600E98D1D /* src */, 2BD2E2F40779F50B00657C69 /* macsrc */, 2BD2E818077AFB9F00657C69 /* Resources */, - 2B3E5DED062B36A0001D796E /* NetSfPeopsSoftGPUInterface.nib */, 2B038D2206918AA80082466B /* Info.plist */, 2B3E5A0B062AAC34001D796E /* Frameworks */, 2B3E5A46062AACF3001D796E /* Products */, @@ -129,7 +128,8 @@ 2BD2E818077AFB9F00657C69 /* Resources */ = { isa = PBXGroup; children = ( - 2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */, + 28586CC714651E9B0082B8EC /* NetSfPeopsSoftGPUConfig.xib */, + 28586CCA14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib */, 2BD2E767077AF53E00657C69 /* Credits.rtf */, 2B038C05069183300082466B /* InfoPlist.strings */, ); @@ -186,8 +186,11 @@ /* Begin PBXProject section */ 2B3E5A03062AAC1A001D796E /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsSoftGPU" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -211,10 +214,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2B959DE106342C31000F2A2D /* NetSfPeopsSoftGPUInterface.nib in Resources */, 2B038C07069183300082466B /* InfoPlist.strings in Resources */, - 2BD2E829077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib in Resources */, 2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */, + 28586CC914651E9B0082B8EC /* NetSfPeopsSoftGPUConfig.xib in Resources */, + 28586CCB14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -243,6 +246,14 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ + 28586CC714651E9B0082B8EC /* NetSfPeopsSoftGPUConfig.xib */ = { + isa = PBXVariantGroup; + children = ( + 28586CC814651E9B0082B8EC /* English */, + ); + name = NetSfPeopsSoftGPUConfig.xib; + sourceTree = "<group>"; + }; 2B038C05069183300082466B /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -259,18 +270,10 @@ name = Credits.rtf; sourceTree = "<group>"; }; - 2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */ = { - isa = PBXVariantGroup; - children = ( - 2B371FBB0773859200B1DC0B /* English */, - ); - name = NetSfPeopsSoftGPUConfig.nib; - sourceTree = "<group>"; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 7170842D0FDFD328004F3EB4 /* Development */ = { + 7170842D0FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -310,15 +313,14 @@ ); WRAPPER_EXTENSION = psxplugin; }; - name = Development; + name = Debug; }; - 7170842E0FDFD328004F3EB4 /* Deployment */ = { + 7170842E0FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; DEBUGGING_SYMBOLS = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 3; @@ -352,40 +354,48 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 717084320FDFD328004F3EB4 /* Development */ = { + 717084320FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; + ARCHS = ( + i386, + x86_64, + ); GCC_MODEL_TUNING = ""; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( ../../../plugins/dfxvideo, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Development; + name = Debug; }; - 717084330FDFD328004F3EB4 /* Deployment */ = { + 717084330FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ARCHS = ( i386, - ppc, + x86_64, ); GCC_MODEL_TUNING = ""; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; HEADER_SEARCH_PATHS = ( ../../../plugins/dfxvideo, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Deployment; + name = Release; }; /* End XCBuildConfiguration section */ @@ -393,20 +403,20 @@ 7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsSoftGL" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7170842D0FDFD328004F3EB4 /* Development */, - 7170842E0FDFD328004F3EB4 /* Deployment */, + 7170842D0FDFD328004F3EB4 /* Debug */, + 7170842E0FDFD328004F3EB4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsSoftGPU" */ = { isa = XCConfigurationList; buildConfigurations = ( - 717084320FDFD328004F3EB4 /* Development */, - 717084330FDFD328004F3EB4 /* Deployment */, + 717084320FDFD328004F3EB4 /* Debug */, + 717084330FDFD328004F3EB4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m index 3cb3d02b..13f9ff6f 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m @@ -184,7 +184,7 @@ void ReadConfig(void) /* load from preferences */ [keyValues release]; - keyValues = [[defaults dictionaryForKey:PrefsKey] retain]; + keyValues = [[defaults dictionaryForKey:PrefsKey] mutableCopy]; [fpsCounter setIntValue:[[keyValues objectForKey:@"FPS Counter"] intValue]]; [autoFullScreen setIntValue:[[keyValues objectForKey:@"Auto Full Screen"] intValue]]; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m index 9c760ccd..dc4e7dc4 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m +++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m @@ -351,9 +351,8 @@ void BlitScreen16NS(unsigned char * surf,long x,long y) else { szDebugText[0]=0; - if (szMenuBuf) { - strncat(szDispBuf, szMenuBuf, 63 - strlen(szDispBuf)); - } + + strncat(szDispBuf, szMenuBuf, 63 - strlen(szDispBuf)); } NSRect rect = [[[self openGLContext] view] bounds]; diff --git a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h index ff9af258..d88bd867 100644 --- a/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h +++ b/macosx/plugins/DFXVideo/macsrc/PluginWindowController.h @@ -26,7 +26,7 @@ extern NSWindow *gameWindow; extern PluginWindowController *gameController; -@interface PluginWindowController : NSWindowController +@interface PluginWindowController : NSWindowController <NSWindowDelegate> { IBOutlet NSOpenGLView *glView; diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m index 17e76477..81f5f32e 100644 --- a/macosx/plugins/DFXVideo/macsrc/drawgl.m +++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m @@ -116,7 +116,8 @@ unsigned long ulInitDisplay(void) // OPEN GAME WINDOW PluginWindowController *windowController = [PluginWindowController openGameView]; glView = [windowController getOpenGLView]; - [[windowController window] setTitle:[NSString stringWithCString:pCaptionText]]; + NSString *title = [NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]; + [[windowController window] setTitle:title]; return (unsigned long)[windowController window]; } diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib index b3dad11f..e69de29b 100644 --- a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib +++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib @@ -1,43 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {"" = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = {cancel = id; hackToggle = id; ok = id; reset = id; }; - CLASS = NetSfPeopsOpenGLPluginConfigController; - LANGUAGE = ObjC; - OUTLETS = { - advancedBlending = NSControl; - autoFullScreen = NSControl; - blurEffect = NSControl; - ditherMode = NSPopUpButton; - drawScanlines = NSControl; - fpsCounter = NSControl; - frameBufferEffects = NSPopUpButton; - frameSkipping = NSControl; - fullscreenSize = NSPopUpButton; - hackEnable = NSControl; - hacksView = NSView; - mjpegDecoder = NSControl; - mjpegDecoder15bit = NSControl; - gteAccuracy = NSControl; - offscreenDrawing = NSPopUpButton; - opaquePass = NSControl; - proportionalResize = NSControl; - texColorDepth = NSPopUpButton; - texEnhancment = NSSlider; - texFiltering = NSSlider; - vSync = NSControl; - windowSize = NSPopUpButton; - wireframeOnly = NSControl; - zMaskClipping = NSControl; - }; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib index 2f6aa4b6..e69de29b 100644 --- a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib +++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/designable.nib @@ -1,4237 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> - <data> - <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">10J567</string> - <string key="IBDocument.InterfaceBuilderVersion">823</string> - <string key="IBDocument.AppKitVersion">1038.35</string> - <string key="IBDocument.HIToolboxVersion">462.00</string> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">823</string> - </object> - <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> - <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="6"/> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <string key="NS.key.0">PluginDependencyRecalculationVersion</string> - <integer value="1" key="NS.object.0"/> - </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="950051212"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSCustomObject" id="499690858"> - <string key="NSClassName">NetSfPeopsOpenGLPluginConfigController</string> - </object> - <object class="NSCustomObject" id="827476947"> - <string key="NSClassName">FirstResponder</string> - </object> - <object class="NSCustomObject" id="1061884829"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSWindowTemplate" id="484943445"> - <int key="NSWindowStyleMask">1</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{2, 373}, {781, 483}}</string> - <int key="NSWTFlags">1886912512</int> - <string key="NSWindowTitle">GPU Configuration</string> - <string key="NSWindowClass">NSWindow</string> - <object class="NSMutableString" key="NSViewClass"> - <characters key="NS.bytes">View</characters> - </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> - <string key="NSWindowContentMinSize">{283.341, 107}</string> - <object class="NSView" key="NSWindowView" id="675926718"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="295790453"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{523, 12}, {122, 32}}</string> - <reference key="NSSuperview" ref="675926718"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1020051904"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Cancel</string> - <object class="NSFont" key="NSSupport" id="917501388"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="295790453"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="917501388"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="680831604"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{645, 12}, {122, 32}}</string> - <reference key="NSSuperview" ref="675926718"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="972260448"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">OK</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="680831604"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="917501388"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSBox" id="643734158"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="1072853457"> - <reference key="NSNextResponder" ref="643734158"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="133562572"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 190}, {144, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">6</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="923662875"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Use PC FPS calculation</string> - <object class="NSFont" key="NSSupport" id="26"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> - <int key="NSfFlags">3100</int> - </object> - <reference key="NSControlView" ref="133562572"/> - <int key="NSTag">6</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="11340189"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> - <object class="NSButtonImageSource" key="NSAlternateImage" id="283478431"> - <string key="NSImageName">NSSwitch</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="1011559369"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 250}, {135, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">2</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="995028400"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Expand screen width</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="1011559369"/> - <int key="NSTag">2</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="90641044"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 150}, {159, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">8</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="797815704"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Use old frame skipping</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="90641044"/> - <int key="NSTag">8</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="566242487"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 170}, {132, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">7</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="718633857"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Lazy screen updates</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="566242487"/> - <int key="NSTag">7</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="517409982"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 210}, {135, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">4</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="338467785"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Disable coord check</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="517409982"/> - <int key="NSTag">4</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="580361940"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 230}, {180, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">3</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1062172904"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Ignore black brightness color</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="580361940"/> - <int key="NSTag">3</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="787456768"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 270}, {130, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">1</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="187597676"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Odd/even bit hack</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="787456768"/> - <int key="NSTag">1</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="355575740"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 110}, {189, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">10</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="921165460"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Draw tex-quads as triangles</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="355575740"/> - <int key="NSTag">10</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="105719991"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 130}, {195, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">9</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1064695033"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Repeated flat tex triangles</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="105719991"/> - <int key="NSTag">9</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="904926444"> - <reference key="NSNextResponder" ref="1072853457"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 90}, {189, 18}}</string> - <reference key="NSSuperview" ref="1072853457"/> - <int key="NSTag">11</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="494937198"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Fake 'gpu busy' states</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="904926444"/> - <int key="NSTag">11</int> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrame">{{2, 2}, {222, 297}}</string> - <reference key="NSSuperview" ref="643734158"/> - </object> - </object> - <string key="NSFrame">{{538, 56}, {226, 301}}</string> - <reference key="NSSuperview" ref="675926718"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> - <object class="NSColor" key="NSBackgroundColor" id="394867751"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="1072853457"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">0</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSBox" id="93048329"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="4931296"> - <reference key="NSNextResponder" ref="93048329"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="926533537"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{307, 18}, {189, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="88136440"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Sync to Monitor Refresh</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="926533537"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="192278159"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{307, 60}, {147, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="249046253"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Use Frame Skipping</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="192278159"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="564297618"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{307, 80}, {148, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="73527718"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Display FPS Counter</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="564297618"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="802065349"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{307, 40}, {125, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="774322141"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Auto Full Screen</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="802065349"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSPopUpButton" id="682330450"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{149, 92}, {135, 26}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="164444476"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="682330450"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">1</int> - <object class="NSFont" key="NSAlternateImage" id="838376703"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> - <int key="NSfFlags">16</int> - </object> - <string key="NSAlternateContents"/> - <object class="NSMutableString" key="NSKeyEquivalent"> - <characters key="NS.bytes"/> - </object> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="365304276"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">Current</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <object class="NSCustomResource" key="NSOnImage" id="111856249"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuCheckmark</string> - </object> - <object class="NSCustomResource" key="NSMixedImage" id="944141324"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSMenuMixedState</string> - </object> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="642721644"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">OtherViews</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="365304276"/> - <object class="NSMenuItem" id="102829052"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">640 x 480</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - <object class="NSMenuItem" id="44542129"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">800 x 600</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - <object class="NSMenuItem" id="663417540"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">1024 x 768</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - <object class="NSMenuItem" id="544231987"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">1152 x 864</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - <object class="NSMenuItem" id="587771498"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">1280 x1024</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - <object class="NSMenuItem" id="681959169"> - <reference key="NSMenu" ref="642721644"/> - <string key="NSTitle">1600 x 1200</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="164444476"/> - </object> - </object> - </object> - <int key="NSPreferredEdge">3</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">1</int> - </object> - </object> - <object class="NSTextField" id="311314073"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{17, 97}, {136, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="866650165"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">Fullscreen size</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="311314073"/> - <object class="NSColor" key="NSBackgroundColor" id="747736659"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor" id="165518464"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> - </object> - </object> - </object> - </object> - <object class="NSButton" id="787779969"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{307, 100}, {129, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1018906851"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Limit Frame Rate</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="787779969"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="166187954"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 38}, {148, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="558266558"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Disable Screensaver</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="166187954"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="155071639"> - <reference key="NSNextResponder" ref="4931296"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 60}, {155, 18}}</string> - <reference key="NSSuperview" ref="4931296"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="620385287"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Resize Proportionally</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="155071639"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="11340189"/> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrame">{{2, 2}, {510, 127}}</string> - <reference key="NSSuperview" ref="93048329"/> - </object> - </object> - <string key="NSFrame">{{17, 333}, {514, 144}}</string> - <reference key="NSSuperview" ref="675926718"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Display Settings</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="394867751"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="4931296"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSBox" id="809921113"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="154181273"> - <reference key="NSNextResponder" ref="809921113"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextField" id="528429323"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{15, 219}, {144, 17}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="965214932"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Dither Graphics:</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="528429323"/> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSPopUpButton" id="811906754"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{139, 213}, {174, 26}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="255572913"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">1024</int> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="811906754"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="838376703"/> - <object class="NSMutableString" key="NSAlternateContents"> - <characters key="NS.bytes"/> - </object> - <object class="NSMutableString" key="NSKeyEquivalent"> - <characters key="NS.bytes"/> - </object> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="344994821"> - <reference key="NSMenu" ref="731759952"/> - <string key="NSTitle">When Hinted</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="255572913"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="731759952"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">OtherViews</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="456783183"> - <reference key="NSMenu" ref="731759952"/> - <string key="NSTitle">Never</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="255572913"/> - </object> - <reference ref="344994821"/> - <object class="NSMenuItem" id="170738631"> - <reference key="NSMenu" ref="731759952"/> - <string key="NSTitle">Always</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="255572913"/> - </object> - </object> - </object> - <int key="NSSelectedIndex">1</int> - <int key="NSPreferredEdge">3</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">1</int> - </object> - </object> - <object class="NSButton" id="445472897"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 82}, {141, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="538548992"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Draw Wireframes Only</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="445472897"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="611147653"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 138}, {147, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="247908544"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Use Advanced Blending</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="611147653"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="450711814"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 119}, {147, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="902764097"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Perform Opaque Pass</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="450711814"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="276655518"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 100}, {167, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="526689999"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Use Clipping Z-Masks</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="276655518"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="704194983"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 43}, {147, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="97827596"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Motion JPEG decoder</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="704194983"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="455642111"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 24}, {147, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="824050672"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">15bit Motion JPEGs</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="455642111"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="129445233"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 155}, {110, 25}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="250761880"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Draw scan lines</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="129445233"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="896472142"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 62}, {147, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="816460454"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Add Blur</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="896472142"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSPopUpButton" id="1019936731"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{139, 187}, {174, 22}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="505058769"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="1019936731"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="838376703"/> - <string key="NSAlternateContents"/> - <object class="NSMutableString" key="NSKeyEquivalent"> - <characters key="NS.bytes"/> - </object> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="588916550"> - <reference key="NSMenu" ref="931509582"/> - <string key="NSTitle">Default</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="505058769"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="931509582"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">OtherViews</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="239192959"> - <reference key="NSMenu" ref="931509582"/> - <string key="NSTitle">None</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="505058769"/> - </object> - <object class="NSMenuItem" id="88774635"> - <reference key="NSMenu" ref="931509582"/> - <string key="NSTitle">Some</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="505058769"/> - </object> - <reference ref="588916550"/> - <object class="NSMenuItem" id="1004057130"> - <reference key="NSMenu" ref="931509582"/> - <string key="NSTitle">More</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="505058769"/> - </object> - <object class="NSMenuItem" id="1009937097"> - <reference key="NSMenu" ref="931509582"/> - <string key="NSTitle">Aggressive</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="505058769"/> - </object> - </object> - </object> - <int key="NSSelectedIndex">2</int> - <int key="NSPreferredEdge">3</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">1</int> - </object> - </object> - <object class="NSTextField" id="22212234"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{15, 185}, {153, 21}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="230144169"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">Offscreen Drawing</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="22212234"/> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSBox" id="870362045"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSView" id="700769802"> - <reference key="NSNextResponder" ref="870362045"/> - <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSPopUpButton" id="966350560"> - <reference key="NSNextResponder" ref="700769802"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{105, 91}, {191, 26}}</string> - <reference key="NSSuperview" ref="700769802"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="414807946"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="966350560"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="838376703"/> - <string key="NSAlternateContents"/> - <object class="NSMutableString" key="NSKeyEquivalent"> - <characters key="NS.bytes"/> - </object> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="58794692"> - <reference key="NSMenu" ref="107932296"/> - <string key="NSTitle">default</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="414807946"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="107932296"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">OtherViews</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="58794692"/> - <object class="NSMenuItem" id="601605275"> - <reference key="NSMenu" ref="107932296"/> - <string key="NSTitle">RGBA 16</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="414807946"/> - </object> - <object class="NSMenuItem" id="523728554"> - <reference key="NSMenu" ref="107932296"/> - <string key="NSTitle">R5 G5 B5 A1</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="414807946"/> - </object> - <object class="NSMenuItem" id="798650856"> - <reference key="NSMenu" ref="107932296"/> - <string key="NSTitle">RGBA 32</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="414807946"/> - </object> - <object class="NSMenuItem" id="498777223"> - <reference key="NSMenu" ref="107932296"/> - <string key="NSTitle">BGRA 32</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="414807946"/> - </object> - </object> - </object> - <int key="NSPreferredEdge">3</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">1</int> - </object> - </object> - <object class="NSTextField" id="263002935"> - <reference key="NSNextResponder" ref="700769802"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 65}, {114, 17}}</string> - <reference key="NSSuperview" ref="700769802"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="388326571"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">Enhancement</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="263002935"/> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSTextField" id="809674697"> - <reference key="NSNextResponder" ref="700769802"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 27}, {114, 17}}</string> - <reference key="NSSuperview" ref="700769802"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1067959541"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">Filtering</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="809674697"/> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSTextField" id="868714805"> - <reference key="NSNextResponder" ref="700769802"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 97}, {114, 17}}</string> - <reference key="NSSuperview" ref="700769802"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="115632950"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">Color Depth</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="868714805"/> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSSlider" id="417181210"> - <reference key="NSNextResponder" ref="700769802"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{106, 18}, {189, 26}}</string> - <reference key="NSSuperview" ref="700769802"/> - <bool key="NSEnabled">YES</bool> - <object class="NSSliderCell" key="NSCell" id="1070282742"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <object class="NSMutableString" key="NSContents"> - <characters key="NS.bytes"/> - </object> - <object class="NSFont" key="NSSupport" id="264360198"> - <string key="NSName">Helvetica</string> - <double key="NSSize">12</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="417181210"/> - <double key="NSMaxValue">6</double> - <double key="NSMinValue">0.0</double> - <double key="NSValue">0.0</double> - <double key="NSAltIncValue">0.0</double> - <int key="NSNumberOfTickMarks">7</int> - <int key="NSTickMarkPosition">1</int> - <bool key="NSAllowsTickMarkValuesOnly">YES</bool> - <bool key="NSVertical">NO</bool> - </object> - </object> - <object class="NSSlider" id="542707641"> - <reference key="NSNextResponder" ref="700769802"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{106, 61}, {189, 26}}</string> - <reference key="NSSuperview" ref="700769802"/> - <bool key="NSEnabled">YES</bool> - <object class="NSSliderCell" key="NSCell" id="860867881"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <object class="NSMutableString" key="NSContents"> - <characters key="NS.bytes"/> - </object> - <reference key="NSSupport" ref="264360198"/> - <reference key="NSControlView" ref="542707641"/> - <double key="NSMaxValue">2</double> - <double key="NSMinValue">0.0</double> - <double key="NSValue">0.0</double> - <double key="NSAltIncValue">0.0</double> - <int key="NSNumberOfTickMarks">3</int> - <int key="NSTickMarkPosition">1</int> - <bool key="NSAllowsTickMarkValuesOnly">YES</bool> - <bool key="NSVertical">NO</bool> - </object> - </object> - </object> - <string key="NSFrame">{{2, 2}, {307, 139}}</string> - <reference key="NSSuperview" ref="870362045"/> - </object> - </object> - <string key="NSFrame">{{15, 13}, {311, 156}}</string> - <reference key="NSSuperview" ref="154181273"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Textures</string> - <object class="NSFont" key="NSSupport"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSBackgroundColor" ref="394867751"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="700769802"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSPopUpButton" id="582698674"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{345, 187}, {130, 26}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSPopUpButtonCell" key="NSCell" id="307340522"> - <int key="NSCellFlags">-2076049856</int> - <int key="NSCellFlags2">2048</int> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="582698674"/> - <int key="NSButtonFlags">109199615</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="838376703"/> - <string key="NSAlternateContents"/> - <object class="NSMutableString" key="NSKeyEquivalent"> - <characters key="NS.bytes"/> - </object> - <int key="NSPeriodicDelay">400</int> - <int key="NSPeriodicInterval">75</int> - <object class="NSMenuItem" key="NSMenuItem" id="240714803"> - <reference key="NSMenu" ref="2523129"/> - <string key="NSTitle">Item1</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <int key="NSState">1</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="307340522"/> - </object> - <bool key="NSMenuItemRespectAlignment">YES</bool> - <object class="NSMenu" key="NSMenu" id="2523129"> - <object class="NSMutableString" key="NSTitle"> - <characters key="NS.bytes">OtherViews</characters> - </object> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="240714803"/> - <object class="NSMenuItem" id="425250505"> - <reference key="NSMenu" ref="2523129"/> - <string key="NSTitle">Item2</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="307340522"/> - </object> - <object class="NSMenuItem" id="24331712"> - <reference key="NSMenu" ref="2523129"/> - <string key="NSTitle">Item3</string> - <string key="NSKeyEquiv"/> - <int key="NSKeyEquivModMask">1048576</int> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="111856249"/> - <reference key="NSMixedImage" ref="944141324"/> - <string key="NSAction">_popUpItemAction:</string> - <reference key="NSTarget" ref="307340522"/> - </object> - </object> - </object> - <int key="NSPreferredEdge">3</int> - <bool key="NSUsesItemFromMenu">YES</bool> - <bool key="NSAltersState">YES</bool> - <int key="NSArrowPosition">1</int> - </object> - </object> - <object class="NSTextField" id="258095043"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{339, 219}, {141, 17}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="479187425"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">272629760</int> - <string key="NSContents">Frame Buffer Effects</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="258095043"/> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSColorWell" id="322419177"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMutableString"> - <characters key="NS.bytes">NSColor pasteboard type</characters> - </object> - </object> - </object> - <string key="NSFrame">{{460, 156}, {23, 22}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <bool key="NSIsBordered">YES</bool> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwIDAgMC4yMzk5OTk5OTQ2AA</bytes> - </object> - </object> - <object class="NSButton" id="652334343"> - <reference key="NSNextResponder" ref="154181273"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{349, 5}, {147, 18}}</string> - <reference key="NSSuperview" ref="154181273"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="60795979"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">GTE Accuracy</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="652334343"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrame">{{2, 2}, {511, 256}}</string> - <reference key="NSSuperview" ref="809921113"/> - </object> - </object> - <string key="NSFrame">{{17, 56}, {515, 273}}</string> - <reference key="NSSuperview" ref="675926718"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Rendering</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="394867751"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="154181273"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSButton" id="686186701"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{392, 12}, {122, 32}}</string> - <reference key="NSSuperview" ref="675926718"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="624097167"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Reset</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="686186701"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="917501388"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSTextField" id="869239698"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{538, 357}, {211, 68}}</string> - <reference key="NSSuperview" ref="675926718"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="647077883"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">138543104</int> - <string type="base64-UTF8" key="NSContents">T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk -IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu -A</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="869239698"/> - <bool key="NSDrawsBackground">YES</bool> - <reference key="NSBackgroundColor" ref="747736659"/> - <reference key="NSTextColor" ref="165518464"/> - </object> - </object> - <object class="NSButton" id="29302334"> - <reference key="NSNextResponder" ref="675926718"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{594, 431}, {106, 18}}</string> - <reference key="NSSuperview" ref="675926718"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="864869183"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Enable Hacks</string> - <reference key="NSSupport" ref="917501388"/> - <reference key="NSControlView" ref="29302334"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="283478431"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrameSize">{781, 483}</string> - <reference key="NSSuperview"/> - </object> - <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string> - <string key="NSMinSize">{283.341, 129}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> - </object> - <object class="NSObjectController" id="18542629"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Draw Scanlines</string> - <string>Suckass</string> - <string>Fast mjpeg decoder</string> - <string>FPS Counter</string> - <string>Auto Full Screen</string> - <string>VSync</string> - <string>Enable Hacks</string> - <string>Propodrtional Resize</string> - <string>Offscreen Drawing</string> - <string>Dither Mode</string> - <string>Frame Buffer Level</string> - <string>Color Depth Level</string> - <string>Texture Color Depth Level</string> - <string>Texture Filter Level</string> - <string>Advanced Blending</string> - <string>Scanline Color</string> - <string>Frame Limit</string> - <string>Frame Skipping</string> - <string>Proportional Resize</string> - <string>Offscreen Drawing Level</string> - <string>GteAccuracy</string> - </object> - <bool key="NSEditable">YES</bool> - <object class="_NSManagedProxy" key="_NSManagedProxy"/> - </object> - <object class="NSUserDefaultsController" id="732028463"> - <bool key="NSAppliesImmediately">YES</bool> - </object> - <object class="NSUserDefaultsController" id="431136353"> - <bool key="NSSharedInstance">YES</bool> - </object> - </object> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="680831604"/> - <reference key="destination" ref="295790453"/> - </object> - <int key="connectionID">9</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">ok:</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="680831604"/> - </object> - <int key="connectionID">133</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">cancel:</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="295790453"/> - </object> - <int key="connectionID">134</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">reset:</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="686186701"/> - </object> - <int key="connectionID">135</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">fpsCounter</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="564297618"/> - </object> - <int key="connectionID">136</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">autoFullScreen</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="802065349"/> - </object> - <int key="connectionID">137</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">frameSkipping</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="192278159"/> - </object> - <int key="connectionID">138</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">hacksView</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="643734158"/> - </object> - <int key="connectionID">139</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">vSync</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="926533537"/> - </object> - <int key="connectionID">140</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">window</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="484943445"/> - </object> - <int key="connectionID">141</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="484943445"/> - <reference key="destination" ref="499690858"/> - </object> - <int key="connectionID">142</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">ditherMode</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="811906754"/> - </object> - <int key="connectionID">143</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">initialFirstResponder</string> - <reference key="source" ref="484943445"/> - <reference key="destination" ref="564297618"/> - </object> - <int key="connectionID">145</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">hackEnable</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="29302334"/> - </object> - <int key="connectionID">229</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">fullscreenSize</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="682330450"/> - </object> - <int key="connectionID">231</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">offscreenDrawing</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="1019936731"/> - </object> - <int key="connectionID">232</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">frameBufferEffects</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="582698674"/> - </object> - <int key="connectionID">233</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">drawScanlines</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="129445233"/> - </object> - <int key="connectionID">234</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">advancedBlending</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="611147653"/> - </object> - <int key="connectionID">235</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">opaquePass</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="450711814"/> - </object> - <int key="connectionID">236</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">wireframeOnly</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="445472897"/> - </object> - <int key="connectionID">237</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">blurEffect</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="896472142"/> - </object> - <int key="connectionID">238</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">mjpegDecoder</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="704194983"/> - </object> - <int key="connectionID">239</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">mjpegDecoder15bit</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="455642111"/> - </object> - <int key="connectionID">240</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">proportionalResize</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="155071639"/> - </object> - <int key="connectionID">241</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">texColorDepth</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="966350560"/> - </object> - <int key="connectionID">242</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">zMaskClipping</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="276655518"/> - </object> - <int key="connectionID">245</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">texEnhancment</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="542707641"/> - </object> - <int key="connectionID">276</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">texFiltering</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="417181210"/> - </object> - <int key="connectionID">277</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Fast mjpeg decoder</string> - <reference key="source" ref="455642111"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="455642111"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Fast mjpeg decoder</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Fast mjpeg decoder</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">319</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Draw Scanlines</string> - <reference key="source" ref="129445233"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="129445233"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Draw Scanlines</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Draw Scanlines</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">322</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.FPS Counter</string> - <reference key="source" ref="564297618"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="564297618"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.FPS Counter</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.FPS Counter</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">323</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Auto Full Screen</string> - <reference key="source" ref="802065349"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="802065349"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Auto Full Screen</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Auto Full Screen</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">324</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.VSync</string> - <reference key="source" ref="926533537"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="926533537"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.VSync</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.VSync</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">325</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Enable Hacks</string> - <reference key="source" ref="29302334"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="29302334"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Enable Hacks</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Enable Hacks</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">326</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: selection.Dither Mode</string> - <reference key="source" ref="811906754"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="811906754"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">selectedIndex: selection.Dither Mode</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">selection.Dither Mode</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">329</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: selection.Frame Buffer Level</string> - <reference key="source" ref="582698674"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="582698674"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">selectedIndex: selection.Frame Buffer Level</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">selection.Frame Buffer Level</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">330</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: selection.Texture Color Depth Level</string> - <reference key="source" ref="966350560"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="966350560"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">selectedIndex: selection.Texture Color Depth Level</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">selection.Texture Color Depth Level</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">332</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Texture Filter Level</string> - <reference key="source" ref="417181210"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="417181210"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Texture Filter Level</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Texture Filter Level</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">333</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Advanced Blending</string> - <reference key="source" ref="611147653"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="611147653"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Advanced Blending</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Advanced Blending</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">334</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Opaque Pass</string> - <reference key="source" ref="450711814"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="450711814"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Opaque Pass</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Opaque Pass</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">336</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Z Mask Clipping</string> - <reference key="source" ref="276655518"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="276655518"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Z Mask Clipping</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Z Mask Clipping</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">337</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Wireframe Mode</string> - <reference key="source" ref="445472897"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="445472897"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Wireframe Mode</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Wireframe Mode</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">338</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Blur</string> - <reference key="source" ref="896472142"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="896472142"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Blur</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Blur</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">339</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Emulate mjpeg decoder</string> - <reference key="source" ref="704194983"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="704194983"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Emulate mjpeg decoder</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Emulate mjpeg decoder</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">340</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: selection.Draw Scanlines</string> - <reference key="source" ref="322419177"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="322419177"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">enabled: selection.Draw Scanlines</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">selection.Draw Scanlines</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">348</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Texture Enhancement Level</string> - <reference key="source" ref="542707641"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="542707641"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Texture Enhancement Level</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Texture Enhancement Level</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">349</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">contentObject: values.net.sf.peops.GpuOpenGLPlugin Settings</string> - <reference key="source" ref="18542629"/> - <reference key="destination" ref="431136353"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="18542629"/> - <reference key="NSDestination" ref="431136353"/> - <string key="NSLabel">contentObject: values.net.sf.peops.GpuOpenGLPlugin Settings</string> - <string key="NSBinding">contentObject</string> - <string key="NSKeyPath">values.net.sf.peops.GpuOpenGLPlugin Settings</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSHandlesContentAsCompoundValue</string> - <boolean value="YES" key="NS.object.0"/> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">353</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Scanline Color</string> - <reference key="source" ref="322419177"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="322419177"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Scanline Color</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Scanline Color</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">NSUnarchiveFromData</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">354</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">hackToggle:</string> - <reference key="source" ref="499690858"/> - <reference key="destination" ref="29302334"/> - </object> - <int key="connectionID">355</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Frame Limit</string> - <reference key="source" ref="787779969"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="787779969"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Frame Limit</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Frame Limit</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">356</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Frame Skipping</string> - <reference key="source" ref="192278159"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="192278159"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Frame Skipping</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Frame Skipping</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">357</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.Proportional Resize</string> - <reference key="source" ref="155071639"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="155071639"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.Proportional Resize</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.Proportional Resize</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">358</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">selectedIndex: selection.Offscreen Drawing Level</string> - <reference key="source" ref="1019936731"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="1019936731"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">selectedIndex: selection.Offscreen Drawing Level</string> - <string key="NSBinding">selectedIndex</string> - <string key="NSKeyPath">selection.Offscreen Drawing Level</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">359</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.GteAccuracy</string> - <reference key="source" ref="652334343"/> - <reference key="destination" ref="18542629"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="652334343"/> - <reference key="NSDestination" ref="18542629"/> - <string key="NSLabel">value: selection.GteAccuracy</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.GteAccuracy</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">408</int> - </object> - </object> - <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <object class="NSArray" key="object" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <reference key="children" ref="950051212"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-2</int> - <reference key="object" ref="499690858"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-1</int> - <reference key="object" ref="827476947"/> - <reference key="parent" ref="0"/> - <string key="objectName">First Responder</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="484943445"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="675926718"/> - </object> - <reference key="parent" ref="0"/> - <string key="objectName">Window</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="675926718"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="295790453"/> - <reference ref="680831604"/> - <reference ref="686186701"/> - <reference ref="643734158"/> - <reference ref="93048329"/> - <reference ref="809921113"/> - <reference ref="869239698"/> - <reference ref="29302334"/> - </object> - <reference key="parent" ref="484943445"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">7</int> - <reference key="object" ref="295790453"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1020051904"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">8</int> - <reference key="object" ref="680831604"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="972260448"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">10</int> - <reference key="object" ref="686186701"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="624097167"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">76</int> - <reference key="object" ref="643734158"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="133562572"/> - <reference ref="1011559369"/> - <reference ref="90641044"/> - <reference ref="566242487"/> - <reference ref="517409982"/> - <reference ref="580361940"/> - <reference ref="787456768"/> - <reference ref="355575740"/> - <reference ref="105719991"/> - <reference ref="904926444"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">89</int> - <reference key="object" ref="93048329"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="926533537"/> - <reference ref="192278159"/> - <reference ref="564297618"/> - <reference ref="802065349"/> - <reference ref="682330450"/> - <reference ref="311314073"/> - <reference ref="787779969"/> - <reference ref="166187954"/> - <reference ref="155071639"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">107</int> - <reference key="object" ref="809921113"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="528429323"/> - <reference ref="811906754"/> - <reference ref="445472897"/> - <reference ref="611147653"/> - <reference ref="450711814"/> - <reference ref="276655518"/> - <reference ref="704194983"/> - <reference ref="455642111"/> - <reference ref="129445233"/> - <reference ref="896472142"/> - <reference ref="1019936731"/> - <reference ref="22212234"/> - <reference ref="870362045"/> - <reference ref="582698674"/> - <reference ref="258095043"/> - <reference ref="322419177"/> - <reference ref="652334343"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">222</int> - <reference key="object" ref="869239698"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="647077883"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">223</int> - <reference key="object" ref="29302334"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="864869183"/> - </object> - <reference key="parent" ref="675926718"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">306</int> - <reference key="object" ref="18542629"/> - <reference key="parent" ref="0"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">320</int> - <reference key="object" ref="732028463"/> - <reference key="parent" ref="0"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">350</int> - <reference key="object" ref="431136353"/> - <reference key="parent" ref="0"/> - <string key="objectName">Shared Defaults</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">361</int> - <reference key="object" ref="1020051904"/> - <reference key="parent" ref="295790453"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">362</int> - <reference key="object" ref="972260448"/> - <reference key="parent" ref="680831604"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">363</int> - <reference key="object" ref="624097167"/> - <reference key="parent" ref="686186701"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">403</int> - <reference key="object" ref="647077883"/> - <reference key="parent" ref="869239698"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">404</int> - <reference key="object" ref="864869183"/> - <reference key="parent" ref="29302334"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-3</int> - <reference key="object" ref="1061884829"/> - <reference key="parent" ref="0"/> - <string key="objectName">Application</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">75</int> - <reference key="object" ref="133562572"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="923662875"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">365</int> - <reference key="object" ref="923662875"/> - <reference key="parent" ref="133562572"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">80</int> - <reference key="object" ref="1011559369"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="995028400"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">368</int> - <reference key="object" ref="995028400"/> - <reference key="parent" ref="1011559369"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">79</int> - <reference key="object" ref="90641044"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="797815704"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">367</int> - <reference key="object" ref="797815704"/> - <reference key="parent" ref="90641044"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">82</int> - <reference key="object" ref="566242487"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="718633857"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">369</int> - <reference key="object" ref="718633857"/> - <reference key="parent" ref="566242487"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">78</int> - <reference key="object" ref="517409982"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="338467785"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">366</int> - <reference key="object" ref="338467785"/> - <reference key="parent" ref="517409982"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">73</int> - <reference key="object" ref="580361940"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1062172904"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">364</int> - <reference key="object" ref="1062172904"/> - <reference key="parent" ref="580361940"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">147</int> - <reference key="object" ref="787456768"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="187597676"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">370</int> - <reference key="object" ref="187597676"/> - <reference key="parent" ref="787456768"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">148</int> - <reference key="object" ref="355575740"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="921165460"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">371</int> - <reference key="object" ref="921165460"/> - <reference key="parent" ref="355575740"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">149</int> - <reference key="object" ref="105719991"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1064695033"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">372</int> - <reference key="object" ref="1064695033"/> - <reference key="parent" ref="105719991"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">150</int> - <reference key="object" ref="904926444"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="494937198"/> - </object> - <reference key="parent" ref="643734158"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">373</int> - <reference key="object" ref="494937198"/> - <reference key="parent" ref="904926444"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">93</int> - <reference key="object" ref="926533537"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="88136440"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">374</int> - <reference key="object" ref="88136440"/> - <reference key="parent" ref="926533537"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">96</int> - <reference key="object" ref="192278159"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="249046253"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">375</int> - <reference key="object" ref="249046253"/> - <reference key="parent" ref="192278159"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">97</int> - <reference key="object" ref="564297618"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="73527718"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">376</int> - <reference key="object" ref="73527718"/> - <reference key="parent" ref="564297618"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">99</int> - <reference key="object" ref="802065349"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="774322141"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">377</int> - <reference key="object" ref="774322141"/> - <reference key="parent" ref="802065349"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">162</int> - <reference key="object" ref="682330450"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="164444476"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">378</int> - <reference key="object" ref="164444476"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="642721644"/> - </object> - <reference key="parent" ref="682330450"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">163</int> - <reference key="object" ref="642721644"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="44542129"/> - <reference ref="102829052"/> - <reference ref="663417540"/> - <reference ref="544231987"/> - <reference ref="587771498"/> - <reference ref="681959169"/> - <reference ref="365304276"/> - </object> - <reference key="parent" ref="164444476"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">164</int> - <reference key="object" ref="44542129"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">165</int> - <reference key="object" ref="102829052"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">166</int> - <reference key="object" ref="663417540"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">246</int> - <reference key="object" ref="544231987"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">247</int> - <reference key="object" ref="587771498"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">248</int> - <reference key="object" ref="681959169"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">249</int> - <reference key="object" ref="365304276"/> - <reference key="parent" ref="642721644"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">168</int> - <reference key="object" ref="311314073"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="866650165"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">379</int> - <reference key="object" ref="866650165"/> - <reference key="parent" ref="311314073"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">177</int> - <reference key="object" ref="787779969"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1018906851"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">380</int> - <reference key="object" ref="1018906851"/> - <reference key="parent" ref="787779969"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">187</int> - <reference key="object" ref="166187954"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="558266558"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">381</int> - <reference key="object" ref="558266558"/> - <reference key="parent" ref="166187954"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">214</int> - <reference key="object" ref="155071639"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="620385287"/> - </object> - <reference key="parent" ref="93048329"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">382</int> - <reference key="object" ref="620385287"/> - <reference key="parent" ref="155071639"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">112</int> - <reference key="object" ref="528429323"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="965214932"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">383</int> - <reference key="object" ref="965214932"/> - <reference key="parent" ref="528429323"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">116</int> - <reference key="object" ref="811906754"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="255572913"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">384</int> - <reference key="object" ref="255572913"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="731759952"/> - </object> - <reference key="parent" ref="811906754"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">113</int> - <reference key="object" ref="731759952"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="456783183"/> - <reference ref="170738631"/> - <reference ref="344994821"/> - </object> - <reference key="parent" ref="255572913"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">111</int> - <reference key="object" ref="456783183"/> - <reference key="parent" ref="731759952"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">114</int> - <reference key="object" ref="170738631"/> - <reference key="parent" ref="731759952"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">115</int> - <reference key="object" ref="344994821"/> - <reference key="parent" ref="731759952"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">175</int> - <reference key="object" ref="445472897"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="538548992"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">385</int> - <reference key="object" ref="538548992"/> - <reference key="parent" ref="445472897"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">178</int> - <reference key="object" ref="611147653"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="247908544"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">386</int> - <reference key="object" ref="247908544"/> - <reference key="parent" ref="611147653"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">179</int> - <reference key="object" ref="450711814"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="902764097"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">387</int> - <reference key="object" ref="902764097"/> - <reference key="parent" ref="450711814"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">180</int> - <reference key="object" ref="276655518"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="526689999"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">388</int> - <reference key="object" ref="526689999"/> - <reference key="parent" ref="276655518"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">181</int> - <reference key="object" ref="704194983"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="97827596"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">389</int> - <reference key="object" ref="97827596"/> - <reference key="parent" ref="704194983"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">182</int> - <reference key="object" ref="455642111"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="824050672"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">390</int> - <reference key="object" ref="824050672"/> - <reference key="parent" ref="455642111"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">183</int> - <reference key="object" ref="129445233"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="250761880"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">391</int> - <reference key="object" ref="250761880"/> - <reference key="parent" ref="129445233"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">185</int> - <reference key="object" ref="896472142"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="816460454"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">392</int> - <reference key="object" ref="816460454"/> - <reference key="parent" ref="896472142"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">202</int> - <reference key="object" ref="1019936731"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="505058769"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">393</int> - <reference key="object" ref="505058769"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="931509582"/> - </object> - <reference key="parent" ref="1019936731"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">203</int> - <reference key="object" ref="931509582"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="88774635"/> - <reference ref="239192959"/> - <reference ref="588916550"/> - <reference ref="1004057130"/> - <reference ref="1009937097"/> - </object> - <reference key="parent" ref="505058769"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">204</int> - <reference key="object" ref="88774635"/> - <reference key="parent" ref="931509582"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">205</int> - <reference key="object" ref="239192959"/> - <reference key="parent" ref="931509582"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">206</int> - <reference key="object" ref="588916550"/> - <reference key="parent" ref="931509582"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">254</int> - <reference key="object" ref="1004057130"/> - <reference key="parent" ref="931509582"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">255</int> - <reference key="object" ref="1009937097"/> - <reference key="parent" ref="931509582"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">207</int> - <reference key="object" ref="22212234"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="230144169"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">394</int> - <reference key="object" ref="230144169"/> - <reference key="parent" ref="22212234"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">212</int> - <reference key="object" ref="870362045"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="966350560"/> - <reference ref="263002935"/> - <reference ref="809674697"/> - <reference ref="868714805"/> - <reference ref="417181210"/> - <reference ref="542707641"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">215</int> - <reference key="object" ref="582698674"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="307340522"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">401</int> - <reference key="object" ref="307340522"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="2523129"/> - </object> - <reference key="parent" ref="582698674"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">216</int> - <reference key="object" ref="2523129"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="425250505"/> - <reference ref="240714803"/> - <reference ref="24331712"/> - </object> - <reference key="parent" ref="307340522"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">217</int> - <reference key="object" ref="425250505"/> - <reference key="parent" ref="2523129"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">218</int> - <reference key="object" ref="240714803"/> - <reference key="parent" ref="2523129"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">219</int> - <reference key="object" ref="24331712"/> - <reference key="parent" ref="2523129"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">220</int> - <reference key="object" ref="258095043"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="479187425"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">402</int> - <reference key="object" ref="479187425"/> - <reference key="parent" ref="258095043"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">341</int> - <reference key="object" ref="322419177"/> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">169</int> - <reference key="object" ref="966350560"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="414807946"/> - </object> - <reference key="parent" ref="870362045"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">395</int> - <reference key="object" ref="414807946"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="107932296"/> - </object> - <reference key="parent" ref="966350560"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">170</int> - <reference key="object" ref="107932296"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="498777223"/> - <reference ref="798650856"/> - <reference ref="523728554"/> - <reference ref="58794692"/> - <reference ref="601605275"/> - </object> - <reference key="parent" ref="414807946"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">251</int> - <reference key="object" ref="498777223"/> - <reference key="parent" ref="107932296"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">250</int> - <reference key="object" ref="798650856"/> - <reference key="parent" ref="107932296"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">173</int> - <reference key="object" ref="523728554"/> - <reference key="parent" ref="107932296"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">172</int> - <reference key="object" ref="58794692"/> - <reference key="parent" ref="107932296"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">171</int> - <reference key="object" ref="601605275"/> - <reference key="parent" ref="107932296"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">201</int> - <reference key="object" ref="263002935"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="388326571"/> - </object> - <reference key="parent" ref="870362045"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">398</int> - <reference key="object" ref="388326571"/> - <reference key="parent" ref="263002935"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">193</int> - <reference key="object" ref="809674697"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1067959541"/> - </object> - <reference key="parent" ref="870362045"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">397</int> - <reference key="object" ref="1067959541"/> - <reference key="parent" ref="809674697"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">174</int> - <reference key="object" ref="868714805"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="115632950"/> - </object> - <reference key="parent" ref="870362045"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">396</int> - <reference key="object" ref="115632950"/> - <reference key="parent" ref="868714805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">252</int> - <reference key="object" ref="417181210"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1070282742"/> - </object> - <reference key="parent" ref="870362045"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">399</int> - <reference key="object" ref="1070282742"/> - <reference key="parent" ref="417181210"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">253</int> - <reference key="object" ref="542707641"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="860867881"/> - </object> - <reference key="parent" ref="870362045"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">400</int> - <reference key="object" ref="860867881"/> - <reference key="parent" ref="542707641"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">405</int> - <reference key="object" ref="652334343"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="60795979"/> - </object> - <reference key="parent" ref="809921113"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">406</int> - <reference key="object" ref="60795979"/> - <reference key="parent" ref="652334343"/> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>10.IBPluginDependency</string> - <string>10.ImportedFromIB2</string> - <string>107.IBAttributePlaceholdersKey</string> - <string>107.IBPluginDependency</string> - <string>107.ImportedFromIB2</string> - <string>111.IBPluginDependency</string> - <string>111.ImportedFromIB2</string> - <string>112.IBAttributePlaceholdersKey</string> - <string>112.IBPluginDependency</string> - <string>112.ImportedFromIB2</string> - <string>113.IBPluginDependency</string> - <string>113.ImportedFromIB2</string> - <string>114.IBPluginDependency</string> - <string>114.ImportedFromIB2</string> - <string>115.IBPluginDependency</string> - <string>115.ImportedFromIB2</string> - <string>116.IBAttributePlaceholdersKey</string> - <string>116.IBPluginDependency</string> - <string>116.ImportedFromIB2</string> - <string>147.IBAttributePlaceholdersKey</string> - <string>147.IBPluginDependency</string> - <string>147.ImportedFromIB2</string> - <string>148.IBAttributePlaceholdersKey</string> - <string>148.IBPluginDependency</string> - <string>148.ImportedFromIB2</string> - <string>149.IBAttributePlaceholdersKey</string> - <string>149.IBPluginDependency</string> - <string>149.ImportedFromIB2</string> - <string>150.IBAttributePlaceholdersKey</string> - <string>150.IBPluginDependency</string> - <string>150.ImportedFromIB2</string> - <string>162.IBAttributePlaceholdersKey</string> - <string>162.IBPluginDependency</string> - <string>162.ImportedFromIB2</string> - <string>163.IBPluginDependency</string> - <string>163.ImportedFromIB2</string> - <string>164.IBPluginDependency</string> - <string>164.ImportedFromIB2</string> - <string>165.IBPluginDependency</string> - <string>165.ImportedFromIB2</string> - <string>166.IBPluginDependency</string> - <string>166.ImportedFromIB2</string> - <string>168.IBAttributePlaceholdersKey</string> - <string>168.IBPluginDependency</string> - <string>168.ImportedFromIB2</string> - <string>169.IBAttributePlaceholdersKey</string> - <string>169.IBPluginDependency</string> - <string>169.ImportedFromIB2</string> - <string>170.IBPluginDependency</string> - <string>170.ImportedFromIB2</string> - <string>171.IBPluginDependency</string> - <string>171.ImportedFromIB2</string> - <string>172.IBPluginDependency</string> - <string>172.ImportedFromIB2</string> - <string>173.IBPluginDependency</string> - <string>173.ImportedFromIB2</string> - <string>174.IBAttributePlaceholdersKey</string> - <string>174.IBPluginDependency</string> - <string>174.ImportedFromIB2</string> - <string>175.IBAttributePlaceholdersKey</string> - <string>175.IBPluginDependency</string> - <string>175.ImportedFromIB2</string> - <string>177.IBAttributePlaceholdersKey</string> - <string>177.IBPluginDependency</string> - <string>177.ImportedFromIB2</string> - <string>178.IBPluginDependency</string> - <string>178.ImportedFromIB2</string> - <string>179.IBPluginDependency</string> - <string>179.ImportedFromIB2</string> - <string>180.IBAttributePlaceholdersKey</string> - <string>180.IBPluginDependency</string> - <string>180.ImportedFromIB2</string> - <string>181.IBAttributePlaceholdersKey</string> - <string>181.IBPluginDependency</string> - <string>181.ImportedFromIB2</string> - <string>182.IBAttributePlaceholdersKey</string> - <string>182.IBPluginDependency</string> - <string>182.IBViewBoundsToFrameTransform</string> - <string>182.ImportedFromIB2</string> - <string>183.IBAttributePlaceholdersKey</string> - <string>183.IBPluginDependency</string> - <string>183.ImportedFromIB2</string> - <string>185.IBAttributePlaceholdersKey</string> - <string>185.IBPluginDependency</string> - <string>185.ImportedFromIB2</string> - <string>187.IBPluginDependency</string> - <string>187.ImportedFromIB2</string> - <string>193.IBAttributePlaceholdersKey</string> - <string>193.IBPluginDependency</string> - <string>193.ImportedFromIB2</string> - <string>201.IBAttributePlaceholdersKey</string> - <string>201.IBPluginDependency</string> - <string>201.ImportedFromIB2</string> - <string>202.IBAttributePlaceholdersKey</string> - <string>202.IBPluginDependency</string> - <string>202.ImportedFromIB2</string> - <string>203.IBPluginDependency</string> - <string>203.ImportedFromIB2</string> - <string>204.IBPluginDependency</string> - <string>204.ImportedFromIB2</string> - <string>205.IBPluginDependency</string> - <string>205.ImportedFromIB2</string> - <string>206.IBPluginDependency</string> - <string>206.ImportedFromIB2</string> - <string>207.IBAttributePlaceholdersKey</string> - <string>207.IBPluginDependency</string> - <string>207.ImportedFromIB2</string> - <string>212.IBPluginDependency</string> - <string>212.ImportedFromIB2</string> - <string>214.IBAttributePlaceholdersKey</string> - <string>214.IBPluginDependency</string> - <string>214.ImportedFromIB2</string> - <string>215.IBPluginDependency</string> - <string>215.ImportedFromIB2</string> - <string>216.IBPluginDependency</string> - <string>216.ImportedFromIB2</string> - <string>217.IBPluginDependency</string> - <string>217.ImportedFromIB2</string> - <string>218.IBPluginDependency</string> - <string>218.ImportedFromIB2</string> - <string>219.IBPluginDependency</string> - <string>219.ImportedFromIB2</string> - <string>220.IBAttributePlaceholdersKey</string> - <string>220.IBPluginDependency</string> - <string>220.ImportedFromIB2</string> - <string>222.IBPluginDependency</string> - <string>222.ImportedFromIB2</string> - <string>223.IBPluginDependency</string> - <string>223.ImportedFromIB2</string> - <string>246.IBPluginDependency</string> - <string>246.ImportedFromIB2</string> - <string>247.IBPluginDependency</string> - <string>247.ImportedFromIB2</string> - <string>248.IBPluginDependency</string> - <string>248.ImportedFromIB2</string> - <string>249.IBPluginDependency</string> - <string>249.ImportedFromIB2</string> - <string>250.IBPluginDependency</string> - <string>250.ImportedFromIB2</string> - <string>251.IBPluginDependency</string> - <string>251.ImportedFromIB2</string> - <string>252.IBAttributePlaceholdersKey</string> - <string>252.IBPluginDependency</string> - <string>252.ImportedFromIB2</string> - <string>253.IBAttributePlaceholdersKey</string> - <string>253.IBPluginDependency</string> - <string>253.ImportedFromIB2</string> - <string>254.IBPluginDependency</string> - <string>254.ImportedFromIB2</string> - <string>255.IBPluginDependency</string> - <string>255.ImportedFromIB2</string> - <string>306.IBPluginDependency</string> - <string>306.ImportedFromIB2</string> - <string>320.IBPluginDependency</string> - <string>320.ImportedFromIB2</string> - <string>341.IBAttributePlaceholdersKey</string> - <string>341.IBPluginDependency</string> - <string>341.ImportedFromIB2</string> - <string>350.IBPluginDependency</string> - <string>350.ImportedFromIB2</string> - <string>405.IBAttributePlaceholdersKey</string> - <string>405.IBPluginDependency</string> - <string>405.ImportedFromIB2</string> - <string>5.IBEditorWindowLastContentRect</string> - <string>5.IBPluginDependency</string> - <string>5.IBWindowTemplateEditedContentRect</string> - <string>5.ImportedFromIB2</string> - <string>5.windowTemplate.hasMinSize</string> - <string>5.windowTemplate.minSize</string> - <string>6.IBPluginDependency</string> - <string>6.ImportedFromIB2</string> - <string>7.IBPluginDependency</string> - <string>7.ImportedFromIB2</string> - <string>73.IBAttributePlaceholdersKey</string> - <string>73.IBPluginDependency</string> - <string>73.ImportedFromIB2</string> - <string>75.IBAttributePlaceholdersKey</string> - <string>75.IBPluginDependency</string> - <string>75.ImportedFromIB2</string> - <string>76.IBPluginDependency</string> - <string>76.ImportedFromIB2</string> - <string>78.IBAttributePlaceholdersKey</string> - <string>78.IBPluginDependency</string> - <string>78.ImportedFromIB2</string> - <string>79.IBAttributePlaceholdersKey</string> - <string>79.IBPluginDependency</string> - <string>79.ImportedFromIB2</string> - <string>8.IBPluginDependency</string> - <string>8.ImportedFromIB2</string> - <string>80.IBAttributePlaceholdersKey</string> - <string>80.IBPluginDependency</string> - <string>80.ImportedFromIB2</string> - <string>82.IBAttributePlaceholdersKey</string> - <string>82.IBPluginDependency</string> - <string>82.ImportedFromIB2</string> - <string>89.IBPluginDependency</string> - <string>89.ImportedFromIB2</string> - <string>93.IBAttributePlaceholdersKey</string> - <string>93.IBPluginDependency</string> - <string>93.ImportedFromIB2</string> - <string>96.IBAttributePlaceholdersKey</string> - <string>96.IBPluginDependency</string> - <string>96.ImportedFromIB2</string> - <string>97.IBAttributePlaceholdersKey</string> - <string>97.IBPluginDependency</string> - <string>97.ImportedFromIB2</string> - <string>99.IBAttributePlaceholdersKey</string> - <string>99.IBPluginDependency</string> - <string>99.ImportedFromIB2</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="809921113"/> - <string key="toolTip">If your card supports it, will mix textures more accurately</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="528429323"/> - <string key="toolTip">Specify when to use dithering to render colors</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="811906754"/> - <string key="toolTip">Specify when to use dithering to render colors</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="787456768"/> - <string key="toolTip">Chrono Cross</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="355575740"/> - <string key="toolTip">Slightly distorted textures can happen</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="105719991"/> - <string key="toolTip">Needed by Dark Forces</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="904926444"/> - <string key="toolTip">Toggles busy flags after drawing</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="682330450"/> - <string key="toolTip">Change resolution to this when going full screen</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="311314073"/> - <string key="toolTip">Change resolution to this when going full screen</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="966350560"/> - <string key="toolTip">The color depth of stored textures.</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="868714805"/> - <string key="toolTip">The color depth of stored textures.</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="445472897"/> - <string key="toolTip">Transforms your playstation into a wireframe game</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="787779969"/> - <string key="toolTip">Cap the frames per second so emulation doesn't get outta hand</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="276655518"/> - <string key="toolTip">Enables the primitive z-buffer which masks polygons from bleeding</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="704194983"/> - <string key="toolTip">Check this to emulate the special movie decoder</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="455642111"/> - <string key="toolTip">Enabling this will use a faster motion jpeg codec with some quality loss</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSAffineTransform"> - <bytes key="NSTransformStruct">P4AAAL+AAABDrwAAwfgAAA</bytes> - </object> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="129445233"/> - <string key="toolTip">Draws TV-like scan lines over the display</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="896472142"/> - <string key="toolTip">When enabled, renders an almost unnoticeable "motion blur"</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="809674697"/> - <string key="toolTip">Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites.</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="263002935"/> - <string key="toolTip">Select a quality level of texture scaling</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="1019936731"/> - <string key="toolTip">Use offscreen drawing to remove some graphics glitches</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="22212234"/> - <string key="toolTip">Use offscreen drawing to remove some graphics glitches</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="155071639"/> - <string key="toolTip">When checked, will keep the PSX display at natural aspect ratio</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="258095043"/> - <string key="toolTip">Select the method the PSX uses to read the contents of the screen</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="417181210"/> - <string key="toolTip">Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites.</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="542707641"/> - <string key="toolTip">Select a quality level of texture scaling</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="322419177"/> - <string key="toolTip">Select a color and transparency for the scanlines</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="652334343"/> - <string key="toolTip">Enabling this will use a faster motion jpeg codec with some quality loss</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>{{329, 362}, {781, 483}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{329, 362}, {781, 483}}</string> - <boolean value="YES"/> - <boolean value="YES"/> - <string>{283.341, 107}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="580361940"/> - <string key="toolTip">Fixes black screens in Lunar</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="133562572"/> - <string key="toolTip">Better fps limitation with some games</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="517409982"/> - <string key="toolTip">Old compatibility mode</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="90641044"/> - <string key="toolTip">Better fps limitation with some games</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="1011559369"/> - <string key="toolTip">Shows the full area in Capcom 2D fighters</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="566242487"/> - <string key="toolTip">Maybe faster, needed for Pandemonium 2</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="926533537"/> - <string key="toolTip">Removes tearing artifacts by waiting for the monitor to sync. Will cause a slight performance loss. This setting has no effect on LCD monitors.</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="192278159"/> - <string key="toolTip">Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="564297618"/> - <string key="toolTip">When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS)</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="802065349"/> - <string key="toolTip">Automatically enter full screen mode</string> - </object> - </object> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="YES"/> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - <nil key="sourceID"/> - <int key="maxID">408</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBPartialClassDescription"> - <string key="className">FirstResponder</string> - <string key="superclassName">NSObject</string> - <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">:</string> - <string key="NS.object.0">id</string> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <string key="NS.key.0">:</string> - <object class="IBActionInfo" key="NS.object.0"> - <string key="name">:</string> - <string key="candidateClassName">id</string> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NetSfPeopsOpenGLPluginConfigController</string> - <string key="superclassName">NSWindowController</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>cancel:</string> - <string>hackToggle:</string> - <string>ok:</string> - <string>reset:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>cancel:</string> - <string>hackToggle:</string> - <string>ok:</string> - <string>reset:</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">cancel:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">hackToggle:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">ok:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">reset:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> - <object class="NSMutableDictionary" key="outlets"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>advancedBlending</string> - <string>autoFullScreen</string> - <string>blurEffect</string> - <string>ditherMode</string> - <string>drawScanlines</string> - <string>fpsCounter</string> - <string>frameBufferEffects</string> - <string>frameSkipping</string> - <string>fullscreenSize</string> - <string>gteAccuracy</string> - <string>hackEnable</string> - <string>hacksView</string> - <string>mjpegDecoder</string> - <string>mjpegDecoder15bit</string> - <string>offscreenDrawing</string> - <string>opaquePass</string> - <string>proportionalResize</string> - <string>texColorDepth</string> - <string>texEnhancment</string> - <string>texFiltering</string> - <string>vSync</string> - <string>windowSize</string> - <string>wireframeOnly</string> - <string>zMaskClipping</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSControl</string> - <string>NSControl</string> - <string>NSControl</string> - <string>NSPopUpButton</string> - <string>NSControl</string> - <string>NSControl</string> - <string>NSPopUpButton</string> - <string>NSControl</string> - <string>NSPopUpButton</string> - <string>NSControl</string> - <string>NSControl</string> - <string>NSView</string> - <string>NSControl</string> - <string>NSControl</string> - <string>NSPopUpButton</string> - <string>NSControl</string> - <string>NSControl</string> - <string>NSPopUpButton</string> - <string>NSSlider</string> - <string>NSSlider</string> - <string>NSControl</string> - <string>NSPopUpButton</string> - <string>NSControl</string> - <string>NSControl</string> - </object> - </object> - <object class="NSMutableDictionary" key="toOneOutletInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>advancedBlending</string> - <string>autoFullScreen</string> - <string>blurEffect</string> - <string>ditherMode</string> - <string>drawScanlines</string> - <string>fpsCounter</string> - <string>frameBufferEffects</string> - <string>frameSkipping</string> - <string>fullscreenSize</string> - <string>gteAccuracy</string> - <string>hackEnable</string> - <string>hacksView</string> - <string>mjpegDecoder</string> - <string>mjpegDecoder15bit</string> - <string>offscreenDrawing</string> - <string>opaquePass</string> - <string>proportionalResize</string> - <string>texColorDepth</string> - <string>texEnhancment</string> - <string>texFiltering</string> - <string>vSync</string> - <string>windowSize</string> - <string>wireframeOnly</string> - <string>zMaskClipping</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBToOneOutletInfo"> - <string key="name">advancedBlending</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">autoFullScreen</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">blurEffect</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">ditherMode</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">drawScanlines</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fpsCounter</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">frameBufferEffects</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">frameSkipping</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">fullscreenSize</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">gteAccuracy</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">hackEnable</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">hacksView</string> - <string key="candidateClassName">NSView</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">mjpegDecoder</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">mjpegDecoder15bit</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">offscreenDrawing</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">opaquePass</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">proportionalResize</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">texColorDepth</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">texEnhancment</string> - <string key="candidateClassName">NSSlider</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">texFiltering</string> - <string key="candidateClassName">NSSlider</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">vSync</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">windowSize</string> - <string key="candidateClassName">NSPopUpButton</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">wireframeOnly</string> - <string key="candidateClassName">NSControl</string> - </object> - <object class="IBToOneOutletInfo"> - <string key="name">zMaskClipping</string> - <string key="candidateClassName">NSControl</string> - </object> - </object> - </object> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">macsrc/NetSfPeopsOpenGLPluginConfigController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NetSfPeopsOpenGLPluginConfigController</string> - <string key="superclassName">NSWindowController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBUserSource</string> - <string key="minorKey"/> - </object> - </object> - </object> - </object> - <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <integer value="1060" key="NS.object.0"/> - </object> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> - <integer value="3000" key="NS.object.0"/> - </object> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <nil key="IBDocument.LastKnownRelativeProjectPath"/> - <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMenuCheckmark</string> - <string>NSMenuMixedState</string> - <string>NSSwitch</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{9, 8}</string> - <string>{7, 2}</string> - <string>{15, 15}</string> - </object> - </object> - </data> -</archive> diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib index 3481fbf9..e69de29b 100644 --- a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib +++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>115 92 561 249 0 0 1440 878 </string> - <key>IBFramework Version</key> - <string>489.0</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> - <key>IBSystem Version</key> - <string>8S2167</string> -</dict> -</plist> diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib index 9e107a47..e69de29b 100644 --- a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib +++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib @@ -1,22 +0,0 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - CLASS = NetSfPeopsOpenGLGPUPluginGLView; - LANGUAGE = ObjC; - SUPERCLASS = NSOpenGLView; - }, - { - CLASS = NetSfPeopsOpenGLGPUPluginWindow; - LANGUAGE = ObjC; - SUPERCLASS = NSWindow; - }, - { - CLASS = NetSfPeopsSoftGPUPluginWindowController; - LANGUAGE = ObjC; - OUTLETS = {glView = NSOpenGLView; }; - SUPERCLASS = NSWindowController; - } - ); - IBVersion = 1; -}
\ No newline at end of file diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib index 54f46a4d..e69de29b 100644 --- a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib +++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>IBDocumentLocation</key> - <string>99 26 409 240 0 0 1024 746 </string> - <key>IBFramework Version</key> - <string>489.0</string> - <key>IBOpenObjects</key> - <array> - <integer>5</integer> - </array> - <key>IBSystem Version</key> - <string>8S2167</string> -</dict> -</plist> diff --git a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj index 37de74da..940cf4d6 100644 --- a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj +++ b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj @@ -3,10 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ + 28586CBE14651D960082B8EC /* NetSfPeopsOpenGLConfig.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28586CBC14651D960082B8EC /* NetSfPeopsOpenGLConfig.xib */; }; + 28586CC014651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28586CBF14651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib */; }; 2B038C07069183300082466B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2B038C05069183300082466B /* InfoPlist.strings */; }; 2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B959E4306342D32000F2A2D /* OpenGL.framework */; }; 2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E767077AF53E00657C69 /* Credits.rtf */; }; @@ -15,9 +17,7 @@ 3F31AF761302D4B600CBB551 /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF6F1302D4B600CBB551 /* PluginGLView.m */; }; 3F31AF771302D4B600CBB551 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF711302D4B600CBB551 /* PluginWindow.m */; }; 3F31AF781302D4B600CBB551 /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF731302D4B600CBB551 /* PluginWindowController.m */; }; - 3F7F38011307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3F7F38001307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib */; }; 3F7F38041307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */; }; - 3F7F3808130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */; }; 3F7F384813079BFD00556C34 /* texture.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383613079BFD00556C34 /* texture.c */; }; 3F7F384913079BFD00556C34 /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383913079BFD00556C34 /* menu.c */; }; 3F7F384A13079BFD00556C34 /* prim.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383B13079BFD00556C34 /* prim.c */; }; @@ -30,6 +30,9 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 28586CBD14651D960082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.xib; sourceTree = "<group>"; }; + 28586CBF14651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsOpenGLGPUInterface.xib; sourceTree = "<group>"; }; + 28B467F91463DA5B0083F129 /* drawgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawgl.h; path = macsrc/drawgl.h; sourceTree = "<group>"; }; 2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 2B51949E06B3D2D200744730 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; @@ -44,23 +47,21 @@ 3F31AF711302D4B600CBB551 /* PluginWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindow.m; path = macsrc/PluginWindow.m; sourceTree = SOURCE_ROOT; }; 3F31AF721302D4B600CBB551 /* PluginWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindowController.h; path = macsrc/PluginWindowController.h; sourceTree = SOURCE_ROOT; }; 3F31AF731302D4B600CBB551 /* PluginWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindowController.m; path = macsrc/PluginWindowController.m; sourceTree = SOURCE_ROOT; }; - 3F7F38001307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = NetSfPeopsOpenGLGPUInterface.nib; sourceTree = SOURCE_ROOT; }; 3F7F38021307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NetSfPeopsOpenGLPluginConfigController.h; path = macsrc/NetSfPeopsOpenGLPluginConfigController.h; sourceTree = SOURCE_ROOT; }; 3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NetSfPeopsOpenGLPluginConfigController.m; path = macsrc/NetSfPeopsOpenGLPluginConfigController.m; sourceTree = SOURCE_ROOT; }; - 3F7F3807130799CA00556C34 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsOpenGLConfig.nib; sourceTree = "<group>"; }; 3F7F383313079BFD00556C34 /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = stdafx.h; path = ../../../plugins/peopsxgl/stdafx.h; sourceTree = SOURCE_ROOT; }; 3F7F383513079BFD00556C34 /* texture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = texture.h; path = ../../../plugins/peopsxgl/texture.h; sourceTree = SOURCE_ROOT; }; - 3F7F383613079BFD00556C34 /* texture.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = texture.c; path = ../../../plugins/peopsxgl/texture.c; sourceTree = SOURCE_ROOT; }; + 3F7F383613079BFD00556C34 /* texture.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = texture.c; path = ../../../plugins/peopsxgl/texture.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 3F7F383713079BFD00556C34 /* key.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = key.h; path = ../../../plugins/peopsxgl/key.h; sourceTree = SOURCE_ROOT; }; 3F7F383813079BFD00556C34 /* menu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = menu.h; path = ../../../plugins/peopsxgl/menu.h; sourceTree = SOURCE_ROOT; }; - 3F7F383913079BFD00556C34 /* menu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = menu.c; path = ../../../plugins/peopsxgl/menu.c; sourceTree = SOURCE_ROOT; }; + 3F7F383913079BFD00556C34 /* menu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = menu.c; path = ../../../plugins/peopsxgl/menu.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 3F7F383A13079BFD00556C34 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = gpu.h; path = ../../../plugins/peopsxgl/gpu.h; sourceTree = SOURCE_ROOT; }; 3F7F383B13079BFD00556C34 /* prim.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = prim.c; path = ../../../plugins/peopsxgl/prim.c; sourceTree = SOURCE_ROOT; }; 3F7F383C13079BFD00556C34 /* key.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = key.c; path = ../../../plugins/peopsxgl/key.c; sourceTree = SOURCE_ROOT; }; 3F7F383D13079BFD00556C34 /* fps.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = fps.c; path = ../../../plugins/peopsxgl/fps.c; sourceTree = SOURCE_ROOT; }; 3F7F383F13079BFD00556C34 /* gl_ext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = gl_ext.h; path = ../../../plugins/peopsxgl/gl_ext.h; sourceTree = SOURCE_ROOT; }; 3F7F384013079BFD00556C34 /* fps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fps.h; path = ../../../plugins/peopsxgl/fps.h; sourceTree = SOURCE_ROOT; }; - 3F7F384113079BFD00556C34 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = gpu.c; path = ../../../plugins/peopsxgl/gpu.c; sourceTree = SOURCE_ROOT; }; + 3F7F384113079BFD00556C34 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = gpu.c; path = ../../../plugins/peopsxgl/gpu.c; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 3F7F384213079BFD00556C34 /* soft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = soft.h; path = ../../../plugins/peopsxgl/soft.h; sourceTree = SOURCE_ROOT; }; 3F7F384313079BFD00556C34 /* soft.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = soft.c; path = ../../../plugins/peopsxgl/soft.c; sourceTree = SOURCE_ROOT; }; 3F7F384413079BFD00556C34 /* prim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = prim.h; path = ../../../plugins/peopsxgl/prim.h; sourceTree = SOURCE_ROOT; }; @@ -87,7 +88,6 @@ 2B3E59FF062AAC1A001D796E = { isa = PBXGroup; children = ( - 3F7F38001307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib */, 71E9EBF0109F24B600E98D1D /* src */, 2BD2E2F40779F50B00657C69 /* macsrc */, 2BD2E818077AFB9F00657C69 /* Resources */, @@ -119,6 +119,7 @@ children = ( 3F7F38021307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.h */, 3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */, + 28B467F91463DA5B0083F129 /* drawgl.h */, 3F31AF6A1302D4B600CBB551 /* drawgl.m */, 3F31AF6B1302D4B600CBB551 /* ExtendedKeys.h */, 3F31AF6E1302D4B600CBB551 /* PluginGLView.h */, @@ -134,7 +135,8 @@ 2BD2E818077AFB9F00657C69 /* Resources */ = { isa = PBXGroup; children = ( - 3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */, + 28586CBC14651D960082B8EC /* NetSfPeopsOpenGLConfig.xib */, + 28586CBF14651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib */, 2BD2E767077AF53E00657C69 /* Credits.rtf */, 2B038C05069183300082466B /* InfoPlist.strings */, ); @@ -194,8 +196,11 @@ /* Begin PBXProject section */ 2B3E5A03062AAC1A001D796E /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsXGL" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -221,8 +226,8 @@ files = ( 2B038C07069183300082466B /* InfoPlist.strings in Resources */, 2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */, - 3F7F38011307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib in Resources */, - 3F7F3808130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib in Resources */, + 28586CBE14651D960082B8EC /* NetSfPeopsOpenGLConfig.xib in Resources */, + 28586CC014651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -253,6 +258,15 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXVariantGroup section */ + 28586CBC14651D960082B8EC /* NetSfPeopsOpenGLConfig.xib */ = { + isa = PBXVariantGroup; + children = ( + 28586CBD14651D960082B8EC /* English */, + ); + name = NetSfPeopsOpenGLConfig.xib; + path = ../..; + sourceTree = "<group>"; + }; 2B038C05069183300082466B /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -269,18 +283,10 @@ name = Credits.rtf; sourceTree = "<group>"; }; - 3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */ = { - isa = PBXVariantGroup; - children = ( - 3F7F3807130799CA00556C34 /* English */, - ); - name = NetSfPeopsOpenGLConfig.nib; - sourceTree = "<group>"; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 7170842D0FDFD328004F3EB4 /* Development */ = { + 7170842D0FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = NO; @@ -319,15 +325,14 @@ ); WRAPPER_EXTENSION = psxplugin; }; - name = Development; + name = Debug; }; - 7170842E0FDFD328004F3EB4 /* Deployment */ = { + 7170842E0FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { COPY_PHASE_STRIP = YES; DEBUGGING_SYMBOLS = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 3; @@ -361,44 +366,55 @@ WRAPPER_EXTENSION = psxplugin; ZERO_LINK = NO; }; - name = Deployment; + name = Release; }; - 717084320FDFD328004F3EB4 /* Development */ = { + 717084320FDFD328004F3EB4 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(NATIVE_ARCH)"; + ARCHS = ( + x86_64, + i386, + ); GCC_MODEL_TUNING = ""; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; HEADER_SEARCH_PATHS = ( ../../../plugins/peopsxgl, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; - SDKROOT = ""; + MACOSX_DEPLOYMENT_TARGET = 10.6; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Development; + name = Debug; }; - 717084330FDFD328004F3EB4 /* Deployment */ = { + 717084330FDFD328004F3EB4 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = i386; + ARCHS = ( + x86_64, + i386, + ); GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 3; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; HEADER_SEARCH_PATHS = ( ../../../plugins/peopsxgl, ../../../libpcsxcore, ); - MACOSX_DEPLOYMENT_TARGET = 10.4; + MACOSX_DEPLOYMENT_TARGET = 10.6; OTHER_CFLAGS = "-fomit-frame-pointer"; - SDKROOT = ""; + SDKROOT = macosx10.6; SYMROOT = ../../build; + WARNING_CFLAGS = "-Wall"; }; - name = Deployment; + name = Release; }; /* End XCBuildConfiguration section */ @@ -406,20 +422,20 @@ 7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsXGL" */ = { isa = XCConfigurationList; buildConfigurations = ( - 7170842D0FDFD328004F3EB4 /* Development */, - 7170842E0FDFD328004F3EB4 /* Deployment */, + 7170842D0FDFD328004F3EB4 /* Debug */, + 7170842E0FDFD328004F3EB4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsXGL" */ = { isa = XCConfigurationList; buildConfigurations = ( - 717084320FDFD328004F3EB4 /* Development */, - 717084330FDFD328004F3EB4 /* Deployment */, + 717084320FDFD328004F3EB4 /* Debug */, + 717084330FDFD328004F3EB4 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; + defaultConfigurationName = Debug; }; /* End XCConfigurationList section */ }; diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h index da780293..657ac2ad 100644 --- a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h +++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h @@ -36,6 +36,7 @@ - (void)swapBuffer; // I wonder what this does ;-) +- (void)clearBuffer:(BOOL)display; // overrides: - (id) initWithCoder: (NSCoder *) coder; diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m index feb483a9..483a72d3 100644 --- a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m +++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m @@ -129,7 +129,19 @@ // actually not much to do here. [[self openGLContext] flushBuffer]; return; - } +} +// don't know what this does, pasted it in from PeopsSoftGPU's PluginGLView because something was calling it +- (void)clearBuffer:(BOOL)display +{ + if (display == NO) { + //[[self openGLContext] makeCurrentContext]; + //glClear(GL_COLOR_BUFFER_BIT); + //[self loadTextures:NO]; + } else { + noDisplay = YES; + // [self setNeedsDisplay:true]; + } +} @end diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m index 0636490a..5f3ee7dd 100644 --- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m +++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m @@ -24,6 +24,7 @@ #import "Carbon/Carbon.h" #include <OpenGL/gl.h> // OpenGL needed for "externals.h" #include "externals.h" +#include "draw.h" // for CreateScanLines() #undef BOOL // not sure why these aren't class or instance variables... @@ -425,5 +426,5 @@ NSRect FitRectInRect(NSRect source, NSRect destination) void ChangeWindowMode(void) { // glue from PSX thread. Globals are already set - [ gameController performFullscreenSwap]; + [ gameController performFullscreenSwap]; } diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m index 91c7ecbf..dcc40ee2 100644 --- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m +++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m @@ -149,10 +149,15 @@ unsigned long ulInitDisplay(void) // OPEN GAME WINDOW BuildDispMenu(0); } - PluginWindowController *windowController = [PluginWindowController openGameView]; - glView = [windowController getOpenGLView]; + __block PluginWindowController *windowController; + + // this causes a runtime error if it's done on a thread other than the main thread + dispatch_sync(dispatch_get_main_queue(), ^{ + windowController = [PluginWindowController openGameView]; + glView = [windowController getOpenGLView]; - [[windowController window] setTitle:[NSString stringWithCString:pCaptionText]]; + [[windowController window] setTitle:[NSString stringWithCString:pCaptionText encoding:NSUTF8StringEncoding]]; + }); return (unsigned long)[windowController window]; } @@ -182,7 +187,7 @@ void SendContextBack(void) void SetVSync(long myValue) { - long DoItMyFriend = myValue; + GLint DoItMyFriend = myValue; [[glView openGLContext] setValues: &DoItMyFriend forParameter: NSOpenGLCPSwapInterval]; } diff --git a/plugins/dfinput/analog.c b/plugins/dfinput/analog.c index 8d14b00b..7d70e24a 100644 --- a/plugins/dfinput/analog.c +++ b/plugins/dfinput/analog.c @@ -28,8 +28,8 @@ void InitAnalog() { g.PadState[1].AnalogStatus[ANALOG_RIGHT][0] = 127; g.PadState[1].AnalogStatus[ANALOG_RIGHT][1] = 127; - memset(g.PadState[0].AnalogKeyStatus, 0, sizeof(g.PadState[0].AnalogKeyStatus)); - memset(g.PadState[1].AnalogKeyStatus, 0, sizeof(g.PadState[1].AnalogKeyStatus)); + memset((void *)g.PadState[0].AnalogKeyStatus, 0, sizeof(g.PadState[0].AnalogKeyStatus)); + memset((void *)g.PadState[1].AnalogKeyStatus, 0, sizeof(g.PadState[1].AnalogKeyStatus)); } void CheckAnalog() { diff --git a/plugins/dfinput/sdljoy.c b/plugins/dfinput/sdljoy.c index 7111d90b..4351d8a4 100644 --- a/plugins/dfinput/sdljoy.c +++ b/plugins/dfinput/sdljoy.c @@ -19,14 +19,14 @@ #include "pad.h" #if SDL_VERSION_ATLEAST(1,3,0) -static SDL_HapticEffect haptic_rumbleEffect; +//static SDL_HapticEffect haptic_rumbleEffect; #endif void JoyInitHaptic() { #if SDL_VERSION_ATLEAST(1,3,0) uint8_t i; - unsigned int haptic_query = 0; + //unsigned int haptic_query = 0; for (i = 0; i < 2; i++) { if (g.PadState[i].JoyDev && SDL_JoystickIsHaptic(g.PadState[i].JoyDev)) diff --git a/plugins/dfsound/adsr.c b/plugins/dfsound/adsr.c index f75a5127..4eb3748c 100644 --- a/plugins/dfsound/adsr.c +++ b/plugins/dfsound/adsr.c @@ -142,7 +142,7 @@ void InitADSR(void) // INIT ADSR ////////////////////////////////////////////////////////////////////////
-INLINE void StartADSR(int ch) // MIX ADSR
+void StartADSR(int ch) // MIX ADSR
{
s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
s_chan[ch].ADSRX.State=0;
@@ -152,7 +152,7 @@ INLINE void StartADSR(int ch) // MIX ADSR ////////////////////////////////////////////////////////////////////////
-INLINE int MixADSR(int ch) // MIX ADSR
+int MixADSR(int ch) // MIX ADSR
{
int EnvelopeVol = s_chan[ch].ADSRX.EnvelopeVol;
int EnvelopeVol_f = s_chan[ch].ADSRX.EnvelopeVol_f;
diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h index ff2af1ff..a99fc90c 100644 --- a/plugins/dfsound/adsr.h +++ b/plugins/dfsound/adsr.h @@ -15,5 +15,5 @@ * *
***************************************************************************/
-INLINE void StartADSR(int ch);
-INLINE int MixADSR(int ch);
+void StartADSR(int ch);
+int MixADSR(int ch);
diff --git a/plugins/dfsound/cfg.h b/plugins/dfsound/cfg.h index b052b2d9..d26c116e 100644 --- a/plugins/dfsound/cfg.h +++ b/plugins/dfsound/cfg.h @@ -20,6 +20,8 @@ void ReadConfig(void); #ifdef _WINDOWS
BOOL CALLBACK AboutDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK DSoundDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam);
+#elif defined (_MACOSX)
+#include "maccfg.h"
#else
void StartCfgTool(char * pCmdLine);
#endif
diff --git a/plugins/dfsound/reverb.c b/plugins/dfsound/reverb.c index ce119621..bd20f3e5 100644 --- a/plugins/dfsound/reverb.c +++ b/plugins/dfsound/reverb.c @@ -63,7 +63,7 @@ void SetREVERB(unsigned short val) // START REVERB
////////////////////////////////////////////////////////////////////////
-INLINE void StartREVERB(int ch)
+void StartREVERB(int ch)
{
if(s_chan[ch].bReverb && (spuCtrl&0x80)) // reverb possible?
{
@@ -84,7 +84,7 @@ INLINE void StartREVERB(int ch) // HELPER FOR NEILL'S REVERB: re-inits our reverb mixing buf
////////////////////////////////////////////////////////////////////////
-INLINE void InitREVERB(void)
+static INLINE void InitREVERB(void)
{
if(iUseReverb==2)
{memset(sRVBStart,0,NSSIZE*2*4);}
@@ -94,7 +94,7 @@ INLINE void InitREVERB(void) // STORE REVERB
////////////////////////////////////////////////////////////////////////
-INLINE void StoreREVERB_CD(int left, int right,int ns)
+static INLINE void StoreREVERB_CD(int left, int right,int ns)
{
if(iUseReverb==0) return;
else
@@ -112,7 +112,7 @@ INLINE void StoreREVERB_CD(int left, int right,int ns) }
-INLINE void StoreREVERB(int ch,int ns)
+void StoreREVERB(int ch,int ns)
{
if(iUseReverb==0) return;
else
@@ -149,7 +149,7 @@ INLINE void StoreREVERB(int ch,int ns) ////////////////////////////////////////////////////////////////////////
-INLINE int g_buffer(int iOff) // get_buffer content helper: takes care about wraps
+static INLINE int g_buffer(int iOff) // get_buffer content helper: takes care about wraps
{
short * p=(short *)spuMem;
iOff=(iOff*4)+rvb.CurrAddr;
@@ -160,7 +160,7 @@ INLINE int g_buffer(int iOff) // get_buffer content hel ////////////////////////////////////////////////////////////////////////
-INLINE void s_buffer(int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
+static INLINE void s_buffer(int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
{
short * p=(short *)spuMem;
iOff=(iOff*4)+rvb.CurrAddr;
@@ -172,7 +172,7 @@ INLINE void s_buffer(int iOff,int iVal) // set_buffer content hel ////////////////////////////////////////////////////////////////////////
-INLINE void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+static INLINE void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
{
short * p=(short *)spuMem;
iOff=(iOff*4)+rvb.CurrAddr+1;
@@ -184,7 +184,7 @@ INLINE void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample ////////////////////////////////////////////////////////////////////////
-INLINE int MixREVERBLeft(int ns)
+static INLINE int MixREVERBLeft(int ns)
{
if(iUseReverb==0) return 0;
else
@@ -291,7 +291,7 @@ INLINE int MixREVERBLeft(int ns) ////////////////////////////////////////////////////////////////////////
-INLINE int MixREVERBRight(void)
+static INLINE int MixREVERBRight(void)
{
if(iUseReverb==0) return 0;
else
diff --git a/plugins/dfsound/reverb.h b/plugins/dfsound/reverb.h index ce618187..ea0a1a2d 100644 --- a/plugins/dfsound/reverb.h +++ b/plugins/dfsound/reverb.h @@ -16,6 +16,6 @@ ***************************************************************************/
void SetREVERB(unsigned short val);
-INLINE void StartREVERB(int ch);
-INLINE void StoreREVERB(int ch,int ns);
+void StartREVERB(int ch);
+void StoreREVERB(int ch,int ns);
diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c index e646e226..304297db 100644 --- a/plugins/dfsound/spu.c +++ b/plugins/dfsound/spu.c @@ -188,7 +188,7 @@ static int iSecureStart=0; // secure start counter //
-INLINE void InterpolateUp(int ch)
+static INLINE void InterpolateUp(int ch)
{
if(s_chan[ch].SB[32]==1) // flag == 1? calc step and set flag... and don't change the value in this pass
{
@@ -236,7 +236,7 @@ INLINE void InterpolateUp(int ch) // even easier interpolation on downsampling, also no special filter, again just "Pete's common sense" tm
//
-INLINE void InterpolateDown(int ch)
+static INLINE void InterpolateDown(int ch)
{
if(s_chan[ch].sinc>=0x20000L) // we would skip at least one val?
{
@@ -262,7 +262,7 @@ INLINE void InterpolateDown(int ch) // START SOUND... called by main thread to setup a new sound on a channel
////////////////////////////////////////////////////////////////////////
-INLINE void StartSound(int ch)
+static INLINE void StartSound(int ch)
{
StartADSR(ch);
StartREVERB(ch);
@@ -292,7 +292,7 @@ INLINE void StartSound(int ch) // ALL KIND OF HELPERS
////////////////////////////////////////////////////////////////////////
-INLINE void VoiceChangeFrequency(int ch)
+static INLINE void VoiceChangeFrequency(int ch)
{
s_chan[ch].iUsedFreq=s_chan[ch].iActFreq; // -> take it and calc steps
s_chan[ch].sinc=s_chan[ch].iRawPitch<<4;
@@ -302,7 +302,7 @@ INLINE void VoiceChangeFrequency(int ch) ////////////////////////////////////////////////////////////////////////
-INLINE void FModChangeFrequency(int ch,int ns)
+static INLINE void FModChangeFrequency(int ch,int ns)
{
int NP=s_chan[ch].iRawPitch;
@@ -366,7 +366,7 @@ unsigned short NoiseFreqAdd[5] = { 0, 84, 140, 180, 210
};
-INLINE void NoiseClock()
+static INLINE void NoiseClock()
{
unsigned int level;
@@ -392,7 +392,7 @@ INLINE void NoiseClock() }
}
-INLINE int iGetNoiseVal(int ch)
+static INLINE int iGetNoiseVal(int ch)
{
int fa;
@@ -413,7 +413,7 @@ INLINE int iGetNoiseVal(int ch) ////////////////////////////////////////////////////////////////////////
-INLINE void StoreInterpolationVal(int ch,int fa)
+static INLINE void StoreInterpolationVal(int ch,int fa)
{
/*
// fmod channel = sound output
@@ -451,7 +451,7 @@ INLINE void StoreInterpolationVal(int ch,int fa) ////////////////////////////////////////////////////////////////////////
-INLINE int iGetInterpolationVal(int ch)
+static INLINE int iGetInterpolationVal(int ch)
{
int fa;
diff --git a/plugins/dfsound/xa.c b/plugins/dfsound/xa.c index 20b6802a..4f78eb00 100644 --- a/plugins/dfsound/xa.c +++ b/plugins/dfsound/xa.c @@ -45,6 +45,7 @@ uint32_t * CDDAEnd = NULL; int iLeftXAVol = 0x8000;
int iRightXAVol = 0x8000;
+#if 0
static int gauss_ptr = 0;
static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0};
@@ -52,6 +53,7 @@ static int gauss_window[8] = {0, 0, 0, 0, 0, 0, 0, 0}; #define gvall(x) gauss_window[(gauss_ptr+x)&3]
#define gvalr0 gauss_window[4+gauss_ptr]
#define gvalr(x) gauss_window[4+((gauss_ptr+x)&3)]
+#endif
long cdxa_dbuf_ptr;
@@ -62,7 +64,7 @@ long cdxa_dbuf_ptr; static int lastxa_lc, lastxa_rc;
static int lastcd_lc, lastcd_rc;
-INLINE void MixXA(void)
+void MixXA(void)
{
int ns;
int lc,rc;
@@ -260,7 +262,7 @@ unsigned long timeGetTime_spu() // FEED XA
////////////////////////////////////////////////////////////////////////
-INLINE void FeedXA(xa_decode_t *xap)
+void FeedXA(xa_decode_t *xap)
{
int sinc,spos,i,iSize,iPlace;
@@ -451,7 +453,7 @@ INLINE void FeedXA(xa_decode_t *xap) unsigned int cdda_ptr;
-INLINE void FeedCDDA(unsigned char *pcm, int nBytes)
+void FeedCDDA(unsigned char *pcm, int nBytes)
{
while(nBytes>0)
{
diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h index 0928eba2..90b89f41 100644 --- a/plugins/dfsound/xa.h +++ b/plugins/dfsound/xa.h @@ -15,6 +15,6 @@ * *
***************************************************************************/
-INLINE void MixXA(void);
-INLINE void FeedXA(xa_decode_t *xap);
-INLINE void FeedCDDA(unsigned char *pcm, int nBytes); +void MixXA(void);
+void FeedXA(xa_decode_t *xap);
+void FeedCDDA(unsigned char *pcm, int nBytes);
diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c index ef06be1a..1ff9939a 100644 --- a/plugins/dfxvideo/gpu.c +++ b/plugins/dfxvideo/gpu.c @@ -1240,7 +1240,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata) // WRITE STATUS // vram read/write helpers, needed by LEWPY's optimized vram read/write :)
////////////////////////////////////////////////////////////////////////
-__inline void FinishedVRAMWrite(void)
+static __inline void FinishedVRAMWrite(void)
{
/*
// NEWX
@@ -1267,7 +1267,7 @@ __inline void FinishedVRAMWrite(void) VRAMWrite.RowsRemaining = 0;
}
-__inline void FinishedVRAMRead(void)
+static __inline void FinishedVRAMRead(void)
{
// Set register to NORMAL operation
DataReadMode = DR_NORMAL;
@@ -1629,7 +1629,7 @@ void SetFixes(void) unsigned long lUsedAddr[3];
-__inline BOOL CheckForEndlessLoop(unsigned long laddr)
+static __inline BOOL CheckForEndlessLoop(unsigned long laddr)
{
if(laddr==lUsedAddr[1]) return TRUE;
if(laddr==lUsedAddr[2]) return TRUE;
diff --git a/plugins/dfxvideo/prim.c b/plugins/dfxvideo/prim.c index e797dbec..ed9474c1 100644 --- a/plugins/dfxvideo/prim.c +++ b/plugins/dfxvideo/prim.c @@ -50,11 +50,11 @@ BOOL bDoVSyncUpdate=FALSE; #ifdef USE_NASM
#define BGR24to16 i386_BGR24to16
-__inline unsigned short BGR24to16 (uint32_t BGR);
+static __inline unsigned short BGR24to16 (uint32_t BGR);
#else
-__inline unsigned short BGR24to16 (uint32_t BGR)
+static __inline unsigned short BGR24to16 (uint32_t BGR)
{
return (unsigned short)(((BGR>>3)&0x1f)|((BGR&0xf80000)>>9)|((BGR&0xf800)>>6));
}
@@ -65,7 +65,7 @@ __inline unsigned short BGR24to16 (uint32_t BGR) // Update global TP infos
////////////////////////////////////////////////////////////////////////
-__inline void UpdateGlobalTP(unsigned short gdata)
+static __inline void UpdateGlobalTP(unsigned short gdata)
{
GlobalTextAddrX = (gdata << 6) & 0x3c0; // texture addr
@@ -119,7 +119,7 @@ __inline void UpdateGlobalTP(unsigned short gdata) ////////////////////////////////////////////////////////////////////////
-__inline void SetRenderMode(uint32_t DrawAttributes)
+static __inline void SetRenderMode(uint32_t DrawAttributes)
{
DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
@@ -211,7 +211,7 @@ void AdjustCoord1() // \ / \
// 2___3
-__inline BOOL CheckCoord4()
+static __inline BOOL CheckCoord4()
{
if(lx0<0)
{
@@ -277,7 +277,7 @@ __inline BOOL CheckCoord4() return FALSE;
}
-__inline BOOL CheckCoord3()
+static __inline BOOL CheckCoord3()
{
if(lx0<0)
{
@@ -314,7 +314,7 @@ __inline BOOL CheckCoord3() }
-__inline BOOL CheckCoord2()
+static __inline BOOL CheckCoord2()
{
if(lx0<0)
{
@@ -336,7 +336,7 @@ __inline BOOL CheckCoord2() return FALSE;
}
-__inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
+static __inline BOOL CheckCoordL(short slx0,short sly0,short slx1,short sly1)
{
if(slx0<0)
{
diff --git a/plugins/dfxvideo/soft.c b/plugins/dfxvideo/soft.c index b0cbc290..ebe02760 100644 --- a/plugins/dfxvideo/soft.c +++ b/plugins/dfxvideo/soft.c @@ -240,7 +240,7 @@ void Dither16(unsigned short * pdest,uint32_t r,uint32_t g,uint32_t b,unsigned s /////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
-__inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)
+static __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_t m2, int32_t m3)
{
int32_t r,g,b;
@@ -304,7 +304,7 @@ __inline void GetShadeTransCol_Dither(unsigned short * pdest, int32_t m1, int32_ ////////////////////////////////////////////////////////////////////////
-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
{
if(bCheckMask && (*pdest & HOST2LE16(0x8000))) return;
@@ -363,7 +363,7 @@ __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color) ////////////////////////////////////////////////////////////////////////
-__inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
+static __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color)
{
if(DrawSemiTrans)
{
@@ -450,7 +450,7 @@ __inline void GetShadeTransCol32(uint32_t * pdest,uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
{
int32_t r,g,b;unsigned short l;
@@ -523,7 +523,7 @@ __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
{
int32_t r,g,b;unsigned short l;
@@ -544,7 +544,7 @@ __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
{
int32_t r,g,b;unsigned short l;
@@ -617,7 +617,7 @@ __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short colo ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color)
{
int32_t r,g,b,l;
@@ -721,7 +721,7 @@ __inline void GetTextureTransColG32(uint32_t * pdest,uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color)
{
int32_t r,g,b;
@@ -746,7 +746,7 @@ __inline void GetTextureTransColG32_S(uint32_t * pdest,uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
+static __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color)
{
int32_t r,g,b;
@@ -848,7 +848,7 @@ __inline void GetTextureTransColG32_SPR(uint32_t * pdest,uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)
+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short color,int32_t m1,int32_t m2,int32_t m3)
{
int32_t r,g,b;
@@ -919,7 +919,7 @@ __inline void GetTextureTransColGX_Dither(unsigned short * pdest,unsigned short ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
{
int32_t r,g,b;unsigned short l;
@@ -991,7 +991,7 @@ __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,s ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
{
int32_t r,g,b;
@@ -1010,7 +1010,7 @@ __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX32_S(uint32_t * pdest,uint32_t color,short m1,short m2,short m3)
{
int32_t r,g,b;
@@ -1205,11 +1205,11 @@ static int left_B, delta_left_B, right_B, delta_right_B; // NASM version (external):
#define shl10idiv i386_shl10idiv
-__inline int shl10idiv(int x, int y);
+static __inline int shl10idiv(int x, int y);
#else
-__inline int shl10idiv(int x, int y)
+static __inline int shl10idiv(int x, int y)
{
__int64 bi=x;
bi<<=10;
@@ -1222,7 +1222,7 @@ __inline int shl10idiv(int x, int y) // GNUC long long int version:
-__inline int shl10idiv(int x, int y)
+static __inline int shl10idiv(int x, int y)
{
long long int bi=x;
bi<<=10;
@@ -1235,7 +1235,7 @@ __inline int shl10idiv(int x, int y) ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_F(void)
+static __inline int RightSection_F(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1251,7 +1251,7 @@ __inline int RightSection_F(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_F(void)
+static __inline int LeftSection_F(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1267,7 +1267,7 @@ __inline int LeftSection_F(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_F(void)
+static __inline BOOL NextRow_F(void)
{
if(--left_section_height<=0)
{
@@ -1293,7 +1293,7 @@ __inline BOOL NextRow_F(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
{
soft_vertex * v1, * v2, * v3;
int height,longest;
@@ -1355,7 +1355,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_G(void)
+static __inline int RightSection_G(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1371,7 +1371,7 @@ __inline int RightSection_G(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_G(void)
+static __inline int LeftSection_G(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1394,7 +1394,7 @@ __inline int LeftSection_G(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_G(void)
+static __inline BOOL NextRow_G(void)
{
if(--left_section_height<=0)
{
@@ -1423,7 +1423,7 @@ __inline BOOL NextRow_G(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
{
soft_vertex * v1, * v2, * v3;
int height,longest,temp;
@@ -1501,7 +1501,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_FT(void)
+static __inline int RightSection_FT(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1517,7 +1517,7 @@ __inline int RightSection_FT(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_FT(void)
+static __inline int LeftSection_FT(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1538,7 +1538,7 @@ __inline int LeftSection_FT(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_FT(void)
+static __inline BOOL NextRow_FT(void)
{
if(--left_section_height<=0)
{
@@ -1566,7 +1566,7 @@ __inline BOOL NextRow_FT(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
{
soft_vertex * v1, * v2, * v3;
int height,longest,temp;
@@ -1654,7 +1654,7 @@ texture distortions ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_GT(void)
+static __inline int RightSection_GT(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1670,7 +1670,7 @@ __inline int RightSection_GT(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_GT(void)
+static __inline int LeftSection_GT(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1698,7 +1698,7 @@ __inline int LeftSection_GT(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_GT(void)
+static __inline BOOL NextRow_GT(void)
{
if(--left_section_height<=0)
{
@@ -1729,7 +1729,7 @@ __inline BOOL NextRow_GT(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int32_t rgb1, int32_t rgb2, int32_t rgb3)
{
soft_vertex * v1, * v2, * v3;
int height,longest,temp;
@@ -1834,7 +1834,7 @@ texture distortions ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_F4(void)
+static __inline int RightSection_F4(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1853,7 +1853,7 @@ __inline int RightSection_F4(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_F4(void)
+static __inline int LeftSection_F4(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1872,7 +1872,7 @@ __inline int LeftSection_F4(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_F4(void)
+static __inline BOOL NextRow_F4(void)
{
if(--left_section_height<=0)
{
@@ -1904,7 +1904,7 @@ __inline BOOL NextRow_F4(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
{
soft_vertex * v1, * v2, * v3, * v4;
int height,width,longest1,longest2;
@@ -2046,7 +2046,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_FT4(void)
+static __inline int RightSection_FT4(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2069,7 +2069,7 @@ __inline int RightSection_FT4(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_FT4(void)
+static __inline int LeftSection_FT4(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2092,7 +2092,7 @@ __inline int LeftSection_FT4(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_FT4(void)
+static __inline BOOL NextRow_FT4(void)
{
if(--left_section_height<=0)
{
@@ -2128,7 +2128,7 @@ __inline BOOL NextRow_FT4(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
{
soft_vertex * v1, * v2, * v3, * v4;
int height,width,longest1,longest2;
@@ -2277,7 +2277,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3 ////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
-__inline int RightSection_GT4(void)
+static __inline int RightSection_GT4(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2307,7 +2307,7 @@ __inline int RightSection_GT4(void) ////////////////////////////////////////////////////////////////////////
-__inline int LeftSection_GT4(void)
+static __inline int LeftSection_GT4(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2337,7 +2337,7 @@ __inline int LeftSection_GT4(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL NextRow_GT4(void)
+static __inline BOOL NextRow_GT4(void)
{
if(--left_section_height<=0)
{
@@ -2379,7 +2379,7 @@ __inline BOOL NextRow_GT4(void) ////////////////////////////////////////////////////////////////////////
-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)
+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4,int32_t rgb1,int32_t rgb2,int32_t rgb3,int32_t rgb4)
{
soft_vertex * v1, * v2, * v3, * v4;
int height,width,longest1,longest2;
@@ -2549,7 +2549,7 @@ __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3 // POLY 3/4 FLAT SHADED
////////////////////////////////////////////////////////////////////////
-__inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)
+static __inline void drawPoly3Fi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb)
{
int i,j,xmin,xmax,ymin,ymax;
unsigned short color;uint32_t lcolor;
@@ -5187,7 +5187,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3 // POLY 3/4 G-SHADED
////////////////////////////////////////////////////////////////////////
-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3,int32_t rgb1, int32_t rgb2, int32_t rgb3)
{
int i,j,xmin,xmax,ymin,ymax;
int32_t cR1,cG1,cB1;
@@ -7086,7 +7086,7 @@ void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, /*
// no real rect test, but it does its job the way I need it
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
{
if(lx0==lx1 && lx2==lx3) return FALSE;
if(lx0==lx2 && lx1==lx3) return FALSE;
@@ -7096,7 +7096,7 @@ __inline BOOL IsNoRect(void) */
// real rect test
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
{
if(!(dwActFixes&0x200)) return FALSE;
diff --git a/plugins/dfxvideo/zn.c b/plugins/dfxvideo/zn.c index 38b906ba..05ef3c8f 100644 --- a/plugins/dfxvideo/zn.c +++ b/plugins/dfxvideo/zn.c @@ -71,10 +71,10 @@ int iTileCheat=0; typedef struct GPUOTAG
{
- uint32_t Version; // Version of structure - currently 1
- long hWnd; // Window handle
- uint32_t ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW
- uint32_t GPUVersion; // 0 = a, 1 = b, 2 = c
+ uint32_t Version; // Version of structure - currently 1
+ unsigned long hWnd; // Window handle
+ uint32_t ScreenRotation; // 0 = 0CW, 1 = 90CW, 2 = 180CW, 3 = 270CW = 90CCW
+ uint32_t GPUVersion; // 0 = a, 1 = b, 2 = c
const char* GameName; // NULL terminated string
const char* CfgFile; // NULL terminated string
} GPUConfiguration_t;
diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c index 5b64554f..bb8e8370 100644 --- a/plugins/peopsxgl/draw.c +++ b/plugins/peopsxgl/draw.c @@ -33,6 +33,7 @@ // if you use it, you must include it
#include <OpenGL/gl.h>
#include <OpenGL/glext.h>
+#include "drawgl.h"
#endif
////////////////////////////////////////////////////////////////////////////////////
// defines
@@ -751,7 +752,7 @@ void GLcleanup() // real psx polygon coord mapping right... the following
// works not to bad with many games, though
-__inline BOOL CheckCoord4()
+static __inline BOOL CheckCoord4()
{
if(lx0<0)
{
@@ -817,7 +818,7 @@ __inline BOOL CheckCoord4() return FALSE;
}
-__inline BOOL CheckCoord3()
+static __inline BOOL CheckCoord3()
{
if(lx0<0)
{
@@ -854,7 +855,7 @@ __inline BOOL CheckCoord3() }
-__inline BOOL CheckCoord2()
+static __inline BOOL CheckCoord2()
{
if(lx0<0)
{
diff --git a/plugins/peopsxgl/draw.h b/plugins/peopsxgl/draw.h index 82f920db..e05fddfe 100644 --- a/plugins/peopsxgl/draw.h +++ b/plugins/peopsxgl/draw.h @@ -51,6 +51,8 @@ void ReadConfig(void); void WriteConfig(void);
void SetExtGLFuncs(void);
+void CreateScanLines(void);
+
///////////////////////////////////////////////////////////////////////
#endif // _GL_DRAW_H_
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c index 46e98198..de64252b 100644 --- a/plugins/peopsxgl/gpu.c +++ b/plugins/peopsxgl/gpu.c @@ -21,7 +21,9 @@ #include "stdafx.h"
-#if !defined(_MACGL) && !defined(_WINDOWS)
+#if defined (_MACGL)
+#include "drawgl.h"
+#elif !defined(_MACGL) && !defined(_WINDOWS)
#include "config.h"
@@ -1185,7 +1187,7 @@ void PaintBlackBorders(void) // helper to draw scanlines
////////////////////////////////////////////////////////////////////////
-__inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void XPRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
@@ -2345,7 +2347,7 @@ void CALLBACK GPUwriteStatus(uint32_t gdata) BOOL bNeedWriteUpload=FALSE;
-__inline void FinishedVRAMWrite(void)
+static __inline void FinishedVRAMWrite(void)
{
if(bNeedWriteUpload)
{
@@ -2361,7 +2363,7 @@ __inline void FinishedVRAMWrite(void) VRAMWrite.RowsRemaining = 0;
}
-__inline void FinishedVRAMRead(void)
+static __inline void FinishedVRAMRead(void)
{
// set register to NORMAL operation
iDataReadMode = DR_NORMAL;
@@ -3041,7 +3043,7 @@ void SetFixes(void) uint32_t lUsedAddr[3];
-__inline BOOL CheckForEndlessLoop(uint32_t laddr)
+static __inline BOOL CheckForEndlessLoop(uint32_t laddr)
{
if(laddr==lUsedAddr[1]) return TRUE;
if(laddr==lUsedAddr[2]) return TRUE;
diff --git a/plugins/peopsxgl/prim.c b/plugins/peopsxgl/prim.c index 2209a1ad..04b1c7af 100644 --- a/plugins/peopsxgl/prim.c +++ b/plugins/peopsxgl/prim.c @@ -146,7 +146,7 @@ unsigned short BGR24to16 (uint32_t BGR) // OpenGL primitive drawing commands
////////////////////////////////////////////////////////////////////////
-__inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_TRIANGLE_STRIP);
@@ -166,7 +166,7 @@ __inline void PRIMdrawTexturedQuad(OGLVertex* vertex1, OGLVertex* vertex2, /////////////////////////////////////////////////////////
-__inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3)
{
glBegin(GL_TRIANGLES);
@@ -183,7 +183,7 @@ __inline void PRIMdrawTexturedTri(OGLVertex* vertex1, OGLVertex* vertex2, /////////////////////////////////////////////////////////
-__inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3)
{
glBegin(GL_TRIANGLES);
@@ -204,7 +204,7 @@ __inline void PRIMdrawTexGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, /////////////////////////////////////////////////////////
-__inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_TRIANGLE_STRIP);
@@ -228,7 +228,7 @@ __inline void PRIMdrawTexGouraudTriColorQuad(OGLVertex* vertex1, OGLVertex* vert /////////////////////////////////////////////////////////
-__inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3)
+static __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* vertex3)
{
glBegin(GL_TRIANGLES);
glVertex3fv(&vertex1->x);
@@ -239,7 +239,7 @@ __inline void PRIMdrawTri(OGLVertex* vertex1, OGLVertex* vertex2, OGLVertex* ver /////////////////////////////////////////////////////////
-__inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_TRIANGLE_STRIP);
@@ -252,7 +252,7 @@ __inline void PRIMdrawTri2(OGLVertex* vertex1, OGLVertex* vertex2, /////////////////////////////////////////////////////////
-__inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3)
{
glBegin(GL_TRIANGLES);
@@ -269,7 +269,7 @@ __inline void PRIMdrawGouraudTriColor(OGLVertex* vertex1, OGLVertex* vertex2, /////////////////////////////////////////////////////////
-__inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_TRIANGLE_STRIP);
@@ -289,7 +289,7 @@ __inline void PRIMdrawGouraudTri2Color(OGLVertex* vertex1, OGLVertex* vertex2, /////////////////////////////////////////////////////////
-__inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
+static __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_QUADS);
@@ -304,7 +304,7 @@ __inline void PRIMdrawFlatLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* /////////////////////////////////////////////////////////
-__inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
+static __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_QUADS);
@@ -324,7 +324,7 @@ __inline void PRIMdrawGouraudLine(OGLVertex* vertex1, OGLVertex* vertex2,OGLVert /////////////////////////////////////////////////////////
-__inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2,
+static __inline void PRIMdrawQuad(OGLVertex* vertex1, OGLVertex* vertex2,
OGLVertex* vertex3, OGLVertex* vertex4)
{
glBegin(GL_QUADS);
@@ -525,7 +525,7 @@ void SetSemiTransMulti(int Pass) // Set several rendering stuff including blending
////////////////////////////////////////////////////////////////////////
-__inline void SetZMask3O(void)
+static __inline void SetZMask3O(void)
{
if(iUseMask && DrawSemiTrans && !iSetMask)
{
@@ -534,7 +534,7 @@ __inline void SetZMask3O(void) }
}
-__inline void SetZMask3(void)
+static __inline void SetZMask3(void)
{
if(iUseMask)
{
@@ -548,7 +548,7 @@ __inline void SetZMask3(void) }
}
-__inline void SetZMask3NT(void)
+static __inline void SetZMask3NT(void)
{
if(iUseMask)
{
@@ -564,7 +564,7 @@ __inline void SetZMask3NT(void) ////////////////////////////////////////////////////////////////////////
-__inline void SetZMask4O(void)
+static __inline void SetZMask4O(void)
{
if(iUseMask && DrawSemiTrans && !iSetMask)
{
@@ -573,7 +573,7 @@ __inline void SetZMask4O(void) }
}
-__inline void SetZMask4(void)
+static __inline void SetZMask4(void)
{
if(iUseMask)
{
@@ -587,7 +587,7 @@ __inline void SetZMask4(void) }
}
-__inline void SetZMask4NT(void)
+static __inline void SetZMask4NT(void)
{
if(iUseMask)
{
@@ -601,7 +601,7 @@ __inline void SetZMask4NT(void) }
}
-__inline void SetZMask4SP(void)
+static __inline void SetZMask4SP(void)
{
if(iUseMask)
{
@@ -622,7 +622,7 @@ __inline void SetZMask4SP(void) ////////////////////////////////////////////////////////////////////////
-__inline void SetRenderState(uint32_t DrawAttributes)
+static __inline void SetRenderState(uint32_t DrawAttributes)
{
bDrawNonShaded = (SHADETEXBIT(DrawAttributes)) ? TRUE : FALSE;
DrawSemiTrans = (SEMITRANSBIT(DrawAttributes)) ? TRUE : FALSE;
@@ -630,7 +630,7 @@ __inline void SetRenderState(uint32_t DrawAttributes) ////////////////////////////////////////////////////////////////////////
-__inline void SetRenderColor(uint32_t DrawAttributes)
+static __inline void SetRenderColor(uint32_t DrawAttributes)
{
if(bDrawNonShaded) {g_m1=g_m2=g_m3=128;}
else
diff --git a/plugins/peopsxgl/soft.c b/plugins/peopsxgl/soft.c index 9f10a2a0..9f5a4012 100644 --- a/plugins/peopsxgl/soft.c +++ b/plugins/peopsxgl/soft.c @@ -232,7 +232,7 @@ void Dither16(unsigned short *pdest, uint32_t r, uint32_t g, uint32_t b, unsigne /////////////////////////////////////////////////////////////////
-__inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)
+static __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int m3)
{
int r,g,b;
@@ -296,7 +296,7 @@ __inline void GetShadeTransCol_Dither(unsigned short *pdest, int m1, int m2, int ////////////////////////////////////////////////////////////////////////
-__inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
+static __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color)
{
if(bCheckMask && *pdest&0x8000) return;
@@ -355,7 +355,7 @@ __inline void GetShadeTransCol(unsigned short * pdest,unsigned short color) ////////////////////////////////////////////////////////////////////////
-__inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
+static __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color)
{
if (DrawSemiTrans)
{
@@ -442,7 +442,7 @@ __inline void GetShadeTransCol32(uint32_t *pdest, uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color)
{
int r,g,b;unsigned short l;
@@ -515,7 +515,7 @@ __inline void GetTextureTransColG(unsigned short * pdest,unsigned short color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color)
{
int r,g,b;unsigned short l;
@@ -537,7 +537,7 @@ __inline void GetTextureTransColG_S(unsigned short * pdest,unsigned short color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
+static __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short color)
{
int r,g,b;unsigned short l;
@@ -610,7 +610,7 @@ __inline void GetTextureTransColG_SPR(unsigned short * pdest,unsigned short colo ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
+static __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color)
{
int r,g,b,l;
@@ -714,7 +714,7 @@ __inline void GetTextureTransColG32(uint32_t *pdest, uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
+static __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color)
{
int r,g,b;
@@ -739,7 +739,7 @@ __inline void GetTextureTransColG32_S(uint32_t *pdest, uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
+static __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color)
{
int r,g,b;
@@ -841,7 +841,7 @@ __inline void GetTextureTransColG32_SPR(uint32_t *pdest, uint32_t color) ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)
+static __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short color, int m1, int m2, int m3)
{
int r,g,b;
@@ -912,7 +912,7 @@ __inline void GetTextureTransColGX_Dither(unsigned short * pdest, unsigned short ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
{
int r,g,b;unsigned short l;
@@ -984,7 +984,7 @@ __inline void GetTextureTransColGX(unsigned short * pdest,unsigned short color,s ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
+static __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color,short m1,short m2,short m3)
{
int r,g,b;
@@ -1003,7 +1003,7 @@ __inline void GetTextureTransColGX_S(unsigned short * pdest,unsigned short color ////////////////////////////////////////////////////////////////////////
-__inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)
+static __inline void GetTextureTransColGX32_S(uint32_t *pdest, uint32_t color, short m1, short m2, short m3)
{
int r,g,b;
@@ -1192,7 +1192,7 @@ static int left_B, delta_left_B, right_B, delta_right_B; #pragma warning (disable : 4035)
-__inline int shl10idiv(int x, int y)
+static __inline int shl10idiv(int x, int y)
{
__asm
{
@@ -1208,7 +1208,7 @@ __inline int shl10idiv(int x, int y) #else
-__inline int shl10idiv(int x, int y)
+static __inline int shl10idiv(int x, int y)
{
long long int bi=x;
bi<<=10;
@@ -1217,7 +1217,7 @@ __inline int shl10idiv(int x, int y) #endif
-__inline int RightSection_F(void)
+static __inline int RightSection_F(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1231,7 +1231,7 @@ __inline int RightSection_F(void) return height;
}
-__inline int LeftSection_F(void)
+static __inline int LeftSection_F(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1245,7 +1245,7 @@ __inline int LeftSection_F(void) return height;
}
-__inline BOOL NextRow_F(void)
+static __inline BOOL NextRow_F(void)
{
if(--left_section_height<=0)
{
@@ -1269,7 +1269,7 @@ __inline BOOL NextRow_F(void) return FALSE;
}
-__inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
+static __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, short y3)
{
soft_vertex * v1, * v2, * v3;
int height,longest;
@@ -1328,7 +1328,7 @@ __inline BOOL SetupSections_F(short x1, short y1, short x2, short y2, short x3, return TRUE;
}
-__inline int RightSection_G(void)
+static __inline int RightSection_G(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1342,7 +1342,7 @@ __inline int RightSection_G(void) return height;
}
-__inline int LeftSection_G(void)
+static __inline int LeftSection_G(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1363,7 +1363,7 @@ __inline int LeftSection_G(void) return height;
}
-__inline BOOL NextRow_G(void)
+static __inline BOOL NextRow_G(void)
{
if(--left_section_height<=0)
{
@@ -1390,7 +1390,7 @@ __inline BOOL NextRow_G(void) return FALSE;
}
-__inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){
+static __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3){
soft_vertex *v1, *v2, *v3;
int height, longest, temp;
@@ -1464,7 +1464,7 @@ __inline BOOL SetupSections_G(short x1,short y1,short x2,short y2,short x3,short return TRUE;
}
-__inline int RightSection_FT(void)
+static __inline int RightSection_FT(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1478,7 +1478,7 @@ __inline int RightSection_FT(void) return height;
}
-__inline int LeftSection_FT(void)
+static __inline int LeftSection_FT(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1497,7 +1497,7 @@ __inline int LeftSection_FT(void) return height;
}
-__inline BOOL NextRow_FT(void)
+static __inline BOOL NextRow_FT(void)
{
if(--left_section_height<=0)
{
@@ -1523,7 +1523,7 @@ __inline BOOL NextRow_FT(void) return FALSE;
}
-__inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
+static __inline BOOL SetupSections_FT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3)
{
soft_vertex * v1, * v2, * v3;
int height,longest,temp;
@@ -1608,7 +1608,7 @@ texture distortions return TRUE;
}
-__inline int RightSection_GT(void)
+static __inline int RightSection_GT(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1622,7 +1622,7 @@ __inline int RightSection_GT(void) return height;
}
-__inline int LeftSection_GT(void)
+static __inline int LeftSection_GT(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1648,7 +1648,7 @@ __inline int LeftSection_GT(void) return height;
}
-__inline BOOL NextRow_GT(void)
+static __inline BOOL NextRow_GT(void)
{
if(--left_section_height<=0)
{
@@ -1677,7 +1677,7 @@ __inline BOOL NextRow_GT(void) return FALSE;
}
-__inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)
+static __inline BOOL SetupSections_GT(short x1, short y1, short x2, short y2, short x3, short y3, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, int rgb1, int rgb2, int rgb3)
{
soft_vertex * v1, * v2, * v3;
int height,longest,temp;
@@ -1779,7 +1779,7 @@ texture distortions return TRUE;
}
-__inline int RightSection_F4(void)
+static __inline int RightSection_F4(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -1796,7 +1796,7 @@ __inline int RightSection_F4(void) return height;
}
-__inline int LeftSection_F4(void)
+static __inline int LeftSection_F4(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -1813,7 +1813,7 @@ __inline int LeftSection_F4(void) return height;
}
-__inline BOOL NextRow_F4(void)
+static __inline BOOL NextRow_F4(void)
{
if(--left_section_height<=0)
{
@@ -1843,7 +1843,7 @@ __inline BOOL NextRow_F4(void) return FALSE;
}
-__inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
+static __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4)
{
soft_vertex * v1, * v2, * v3, * v4;
int height,width,longest1,longest2;
@@ -1982,7 +1982,7 @@ __inline BOOL SetupSections_F4(short x1, short y1, short x2, short y2, short x3, return TRUE;
}
-__inline int RightSection_FT4(void)
+static __inline int RightSection_FT4(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2003,7 +2003,7 @@ __inline int RightSection_FT4(void) return height;
}
-__inline int LeftSection_FT4(void)
+static __inline int LeftSection_FT4(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2024,7 +2024,7 @@ __inline int LeftSection_FT4(void) return height;
}
-__inline BOOL NextRow_FT4(void)
+static __inline BOOL NextRow_FT4(void)
{
if(--left_section_height<=0)
{
@@ -2058,7 +2058,7 @@ __inline BOOL NextRow_FT4(void) return FALSE;
}
-__inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
+static __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4)
{
soft_vertex * v1, * v2, * v3, * v4;
int height,width,longest1,longest2;
@@ -2204,7 +2204,7 @@ __inline BOOL SetupSections_FT4(short x1, short y1, short x2, short y2, short x3 return TRUE;
}
-__inline int RightSection_GT4(void)
+static __inline int RightSection_GT4(void)
{
soft_vertex * v1 = right_array[ right_section ];
soft_vertex * v2 = right_array[ right_section-1 ];
@@ -2232,7 +2232,7 @@ __inline int RightSection_GT4(void) return height;
}
-__inline int LeftSection_GT4(void)
+static __inline int LeftSection_GT4(void)
{
soft_vertex * v1 = left_array[ left_section ];
soft_vertex * v2 = left_array[ left_section-1 ];
@@ -2260,7 +2260,7 @@ __inline int LeftSection_GT4(void) return height;
}
-__inline BOOL NextRow_GT4(void)
+static __inline BOOL NextRow_GT4(void)
{
if(--left_section_height<=0)
{
@@ -2300,7 +2300,7 @@ __inline BOOL NextRow_GT4(void) return FALSE;
}
-__inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)
+static __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3, short y3, short x4, short y4, short tx1, short ty1, short tx2, short ty2, short tx3, short ty3, short tx4, short ty4, int rgb1, int rgb2, int rgb3, int rgb4)
{
soft_vertex * v1, * v2, * v3, * v4;
int height,width,longest1,longest2;
@@ -2466,7 +2466,7 @@ __inline BOOL SetupSections_GT4(short x1, short y1, short x2, short y2, short x3 // POLY 3/4 FLAT SHADED
////////////////////////////////////////////////////////////////////////
-__inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)
+static __inline void drawPoly3Fi(short x1, short y1, short x2, short y2, short x3, short y3, int rgb)
{
int i,j,xmin,xmax,ymin,ymax;
unsigned short color;
@@ -5105,7 +5105,7 @@ void drawPoly4TD_TW_S(short x1, short y1, short x2, short y2, short x3, short y3 // POLY 3/4 G-SHADED
////////////////////////////////////////////////////////////////////////
-__inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)
+static __inline void drawPoly3Gi(short x1,short y1,short x2,short y2,short x3,short y3, int rgb1, int rgb2, int rgb3)
{
int i,j,xmin,xmax,ymin,ymax;
int cR1,cG1,cB1;
@@ -7004,7 +7004,7 @@ void drawPoly4TGD_TW(short x1, short y1, short x2, short y2, short x3, short y3, /*
// no real rect test, but it does its job the way I need it
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
{
if(lx0==lx1 && lx2==lx3) return FALSE;
if(lx0==lx2 && lx1==lx3) return FALSE;
@@ -7014,7 +7014,7 @@ __inline BOOL IsNoRect(void) */
// real rect test
-__inline BOOL IsNoRect(void)
+static __inline BOOL IsNoRect(void)
{
//if(!(dwActFixes&0x200)) return FALSE;
|