From 4d55a8b8254dff61fdc7b1959f6aef7eafbd9439 Mon Sep 17 00:00:00 2001 From: "SND\\edgbla_cp" Date: Wed, 9 Nov 2011 20:49:54 +0000 Subject: Patch 10767 (Durandal_1707). git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72138 e17a0e51-4ae3-4d35-97c3-1a29b211df97 --- .../Common/SDL/src/audio/macosx/SDL_coreaudio.c | 86 +- .../Common/SDL/src/haptic/darwin/SDL_syshaptic.c | 42 +- .../DFCdrom/DFCdrom.xcodeproj/project.pbxproj | 82 +- .../DFCdromPluginConfig.nib/classes.nib | 18 - .../English.lproj/DFCdromPluginConfig.nib/info.nib | 16 - .../DFCdrom/macsrc/PluginConfigController.m | 2 +- .../DFInput/DFInput.xcodeproj/project.pbxproj | 81 +- .../NetPcsxrHIDInputPluginMain.nib/classes.nib | 33 - .../NetPcsxrHIDInputPluginMain.nib/info.nib | 21 - macosx/plugins/DFInput/macsrc/ControllerList.h | 5 +- macosx/plugins/DFInput/macsrc/MappingCell.m | 4 +- macosx/plugins/DFInput/macsrc/cfg.c | 4 +- .../NetSfPeopsSpuPluginMain.nib/classes.nib | 26 - .../NetSfPeopsSpuPluginMain.nib/info.nib | 16 - .../DFSound/PeopsSPU.xcodeproj/project.pbxproj | 99 +- macosx/plugins/DFSound/macsrc/PluginController.h | 4 - macosx/plugins/DFSound/macsrc/PluginController.m | 3 +- .../NetSfPeopsSoftGPUConfig.nib/classes.nib | 26 - .../NetSfPeopsSoftGPUConfig.nib/info.nib | 16 - .../NetSfPeopsSoftGPUInterface.nib/classes.nib | 22 - .../NetSfPeopsSoftGPUInterface.nib/info.nib | 16 - .../PeopsSoftGPU.xcodeproj/project.pbxproj | 88 +- .../DFXVideo/macsrc/PluginConfigController.m | 2 +- macosx/plugins/DFXVideo/macsrc/PluginGLView.m | 5 +- .../DFXVideo/macsrc/PluginWindowController.h | 2 +- macosx/plugins/DFXVideo/macsrc/drawgl.m | 3 +- .../NetSfPeopsOpenGLConfig.nib/classes.nib | 43 - .../NetSfPeopsOpenGLConfig.nib/designable.nib | 4237 -------------------- .../NetSfPeopsOpenGLConfig.nib/info.nib | 16 - .../NetSfPeopsOpenGLGPUInterface.nib/classes.nib | 22 - .../NetSfPeopsOpenGLGPUInterface.nib/info.nib | 16 - .../PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj | 100 +- macosx/plugins/PeopsXgl/macsrc/PluginGLView.h | 1 + macosx/plugins/PeopsXgl/macsrc/PluginGLView.m | 14 +- .../PeopsXgl/macsrc/PluginWindowController.m | 3 +- macosx/plugins/PeopsXgl/macsrc/drawgl.m | 13 +- 36 files changed, 364 insertions(+), 4823 deletions(-) (limited to 'macosx/plugins') 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 = ""; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; + 28586CC514651E870082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DFCdromPluginConfig.xib; sourceTree = ""; }; 2BD707170555997500CB5D9B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - 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 = ""; }; + 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 = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 71F3C32511F3CD0B007B9F12 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cfg.c; path = macsrc/cfg.c; sourceTree = ""; }; 71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PluginConfigController.h; path = macsrc/PluginConfigController.h; sourceTree = ""; }; 71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PluginConfigController.m; path = macsrc/PluginConfigController.m; sourceTree = ""; }; 71F3C38511F3CFED007B9F12 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 71F3C38711F3CFF7007B9F12 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; 71F3C47911F3D108007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; - 71F3C49C11F3D2B3007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/DFCdromPluginConfig.nib; sourceTree = ""; }; 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 = ""; }; /* 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 = ""; }; - 71F3C49B11F3D2B3007B9F12 /* DFCdromPluginConfig.nib */ = { + 71F3C47811F3D108007B9F12 /* Credits.rtf */ = { isa = PBXVariantGroup; children = ( - 71F3C49C11F3D2B3007B9F12 /* English */, + 71F3C47911F3D108007B9F12 /* English */, ); - name = DFCdromPluginConfig.nib; + name = Credits.rtf; sourceTree = ""; }; 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 @@ - - - - - IBDocumentLocation - 117 49 561 249 0 0 1024 746 - IBFramework Version - 446.1 - IBOpenObjects - - 5 - - IBSystem Version - 8P2137 - - 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 = ""; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; + 28586CC214651E730082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.xib; sourceTree = ""; }; 2B679860069193F300E2BD4F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; 2B679861069193F300E2BD4F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; 71054E201204A49F00AC2CCB /* ForceFeedback.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ForceFeedback.framework; path = /System/Library/Frameworks/ForceFeedback.framework; sourceTree = ""; }; 7136F51912011BB4001973D9 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; - 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 = ""; }; - 714FA8F811FC863500517F47 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = cfg.c; path = macsrc/cfg.c; sourceTree = ""; }; + 714FA8F811FC863500517F47 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = cfg.c; path = macsrc/cfg.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 714FA8F911FC863500517F47 /* xkb.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; name = xkb.c; path = macsrc/xkb.c; sourceTree = ""; }; 7192EAAB1200D54500038B92 /* cfg.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = cfg.h; path = macsrc/cfg.h; sourceTree = ""; }; 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 = ""; }; 71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = ""; }; 71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = ""; }; - 71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.nib; sourceTree = ""; }; 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 = ""; }; /* 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 = ""; }; - 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */ = { + 7136F51812011BB4001973D9 /* Credits.rtf */ = { isa = PBXVariantGroup; children = ( - 71E861BB11FF75BA001C1826 /* English */, + 7136F51912011BB4001973D9 /* English */, ); - name = NetPcsxrHIDInputPluginMain.nib; + name = Credits.rtf; sourceTree = ""; }; 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 @@ - - - - - IBDocumentLocation - 54 67 576 240 0 0 1024 746 - IBEditorPositions - - 16 - 293 323 437 378 0 0 1024 746 - - IBFramework Version - 446.1 - IBOpenObjects - - 16 - - IBSystem Version - 8P2137 - - 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 -#import +#import #include "cfg.h" @class KeyConfig; -@interface ControllerList : NSObject { +@interface ControllerList : NSObject { } - (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 @@ - - - - - IBDocumentLocation - 42 12 546 240 0 0 1024 746 - IBFramework Version - 442.0 - IBOpenObjects - - 6 - - IBSystem Version - 8F1099 - - 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 = ""; }; 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = ""; }; + 28E9406D146480AC00BA2A2F /* maccfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maccfg.h; path = macsrc/maccfg.h; sourceTree = ""; }; + 28F0C3A114651EFA00A90285 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.xib; sourceTree = ""; }; 2B4F99F8077B0CE4004E36BA /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; - 2B6DA89307200A9A009F6FED /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.nib; sourceTree = ""; }; 2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginController.h; path = macsrc/PluginController.h; sourceTree = ""; }; 2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginController.m; path = macsrc/PluginController.m; sourceTree = ""; }; 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; @@ -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 = ""; }; 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 = ""; @@ -249,15 +248,16 @@ name = Products; sourceTree = ""; }; - 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 = ""; }; 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 = ""; }; 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 #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 @@ - - - - - IBDocumentLocation - 19 23 561 249 0 0 1024 746 - IBFramework Version - 446.1 - IBOpenObjects - - 5 - - IBSystem Version - 8P2137 - - 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 @@ - - - - - IBDocumentLocation - 99 26 409 240 0 0 1024 746 - IBFramework Version - 364.0 - IBOpenObjects - - 5 - - IBSystem Version - 7S215 - - 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 = ""; }; + 28586CCA14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsSoftGPUInterface.xib; sourceTree = ""; }; 2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2B371FBB0773859200B1DC0B /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.nib; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; @@ -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 = ""; + }; 2B038C05069183300082466B /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -259,18 +270,10 @@ name = Credits.rtf; sourceTree = ""; }; - 2BD2E828077AFC2C00657C69 /* NetSfPeopsSoftGPUConfig.nib */ = { - isa = PBXVariantGroup; - children = ( - 2B371FBB0773859200B1DC0B /* English */, - ); - name = NetSfPeopsSoftGPUConfig.nib; - sourceTree = ""; - }; /* 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 { 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 @@ - - - - 1060 - 10J567 - 823 - 1038.35 - 462.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 823 - - - YES - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NetSfPeopsOpenGLPluginConfigController - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{2, 373}, {781, 483}} - 1886912512 - GPU Configuration - NSWindow - - View - - {3.40282e+38, 3.40282e+38} - {283.341, 107} - - - 256 - - YES - - - 256 - {{523, 12}, {122, 32}} - - YES - - 67239424 - 134217728 - Cancel - - LucidaGrande - 13 - 1044 - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - - 256 - {{645, 12}, {122, 32}} - - YES - - 67239424 - 134217728 - OK - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - - YES - - - 256 - - YES - - - 256 - {{13, 190}, {144, 18}} - - 6 - YES - - 67239424 - 131072 - Use PC FPS calculation - - LucidaGrande - 11 - 3100 - - - 6 - 1211912703 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - - 256 - {{13, 250}, {135, 18}} - - 2 - YES - - 67239424 - 131072 - Expand screen width - - - 2 - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{13, 150}, {159, 18}} - - 8 - YES - - 67239424 - 131072 - Use old frame skipping - - - 8 - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{13, 170}, {132, 18}} - - 7 - YES - - 67239424 - 131072 - Lazy screen updates - - - 7 - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{13, 210}, {135, 18}} - - 4 - YES - - 67239424 - 131072 - Disable coord check - - - 4 - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{13, 230}, {180, 18}} - - 3 - YES - - 67239424 - 131072 - Ignore black brightness color - - - 3 - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{13, 270}, {130, 18}} - - 1 - YES - - 67239424 - 131072 - Odd/even bit hack - - - 1 - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{13, 110}, {189, 18}} - - 10 - YES - - 67239424 - 131072 - Draw tex-quads as triangles - - - 10 - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{13, 130}, {195, 18}} - - 9 - YES - - 67239424 - 131072 - Repeated flat tex triangles - - - 9 - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{13, 90}, {189, 18}} - - 11 - YES - - 67239424 - 131072 - Fake 'gpu busy' states - - - 11 - 1211912703 - 2 - - - - 200 - 25 - - - - {{2, 2}, {222, 297}} - - - - {{538, 56}, {226, 301}} - - {0, 0} - - 67239424 - 0 - - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 3 - 0 - 0 - NO - - - - 256 - - YES - - - 256 - - YES - - - 256 - {{307, 18}, {189, 18}} - - YES - - 67239424 - 0 - Sync to Monitor Refresh - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{307, 60}, {147, 18}} - - YES - - 67239424 - 0 - Use Frame Skipping - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{307, 80}, {148, 18}} - - YES - - 67239424 - 0 - Display FPS Counter - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{307, 40}, {125, 18}} - - YES - - 67239424 - 0 - Auto Full Screen - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{149, 92}, {135, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - LucidaGrande - 13 - 16 - - - - - - 400 - 75 - - - Current - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - - 640 x 480 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 800 x 600 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1024 x 768 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1152 x 864 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1280 x1024 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1600 x 1200 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 3 - YES - YES - 1 - - - - - 256 - {{17, 97}, {136, 18}} - - YES - - 67239424 - 272629760 - Fullscreen size - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2ODY1AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{307, 100}, {129, 18}} - - YES - - 67239424 - 0 - Limit Frame Rate - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 38}, {148, 18}} - - YES - - 67239424 - 0 - Disable Screensaver - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 60}, {155, 18}} - - YES - - 67239424 - 0 - Resize Proportionally - - - 1211912703 - 2 - - - - - 200 - 25 - - - - {{2, 2}, {510, 127}} - - - - {{17, 333}, {514, 144}} - - {0, 0} - - 67239424 - 0 - Display Settings - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 3 - 0 - 2 - NO - - - - 256 - - YES - - - 256 - - YES - - - 256 - {{15, 219}, {144, 17}} - - YES - - 67239424 - 4194304 - Dither Graphics: - - - - - - - - - 256 - {{139, 213}, {174, 26}} - - YES - - -2076049856 - 1024 - - - 109199615 - 1 - - - - - - - - 400 - 75 - - - When Hinted - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - Never - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - - Always - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 1 - 3 - YES - YES - 1 - - - - - 256 - {{349, 82}, {141, 18}} - - YES - - 67239424 - 131072 - Draw Wireframes Only - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 138}, {147, 18}} - - YES - - 67239424 - 131072 - Use Advanced Blending - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 119}, {147, 18}} - - YES - - 67239424 - 131072 - Perform Opaque Pass - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 100}, {167, 18}} - - YES - - 67239424 - 131072 - Use Clipping Z-Masks - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 43}, {147, 18}} - - YES - - 67239424 - 131072 - Motion JPEG decoder - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 24}, {147, 18}} - - YES - - 67239424 - 131072 - 15bit Motion JPEGs - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 155}, {110, 25}} - - YES - - 67239424 - 131072 - Draw scan lines - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{349, 62}, {147, 18}} - - YES - - 67239424 - 131072 - Add Blur - - - 1211912703 - 2 - - - - 200 - 25 - - - - - 256 - {{139, 187}, {174, 22}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - - - - 400 - 75 - - - Default - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - None - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Some - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - - More - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Aggressive - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 2 - 3 - YES - YES - 1 - - - - - 256 - {{15, 185}, {153, 21}} - - YES - - 67239424 - 272629760 - Offscreen Drawing - - - - - - - - - 256 - - YES - - - 256 - - YES - - - 256 - {{105, 91}, {191, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - - - - 400 - 75 - - - default - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - - RGBA 16 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - R5 G5 B5 A1 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - RGBA 32 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - BGRA 32 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 3 - YES - YES - 1 - - - - - 256 - {{13, 65}, {114, 17}} - - YES - - 67239424 - 272629760 - Enhancement - - - - - - - - - 256 - {{13, 27}, {114, 17}} - - YES - - 67239424 - 272629760 - Filtering - - - - - - - - - 256 - {{13, 97}, {114, 17}} - - YES - - 67239424 - 272629760 - Color Depth - - - - - - - - - 256 - {{106, 18}, {189, 26}} - - YES - - 67239424 - 0 - - - - - Helvetica - 12 - 16 - - - 6 - 0.0 - 0.0 - 0.0 - 7 - 1 - YES - NO - - - - - 256 - {{106, 61}, {189, 26}} - - YES - - 67239424 - 0 - - - - - - 2 - 0.0 - 0.0 - 0.0 - 3 - 1 - YES - NO - - - - {{2, 2}, {307, 139}} - - - - {{15, 13}, {311, 156}} - - {0, 0} - - 67239424 - 0 - Textures - - LucidaGrande - 11 - 16 - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{345, 187}, {130, 26}} - - YES - - -2076049856 - 2048 - - - 109199615 - 1 - - - - - - 400 - 75 - - - Item1 - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - - Item2 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Item3 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 3 - YES - YES - 1 - - - - - 256 - {{339, 219}, {141, 17}} - - YES - - 67239424 - 272629760 - Frame Buffer Effects - - - - - - - - - 256 - - YES - - YES - - NSColor pasteboard type - - - - {{460, 156}, {23, 22}} - - YES - YES - - 1 - MCAwIDAgMC4yMzk5OTk5OTQ2AA - - - - - 256 - {{349, 5}, {147, 18}} - - YES - - 67239424 - 131072 - GTE Accuracy - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{2, 2}, {511, 256}} - - - - {{17, 56}, {515, 273}} - - {0, 0} - - 67239424 - 0 - Rendering - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{392, 12}, {122, 32}} - - YES - - 67239424 - 134217728 - Reset - - - -2038284033 - 1 - - - - 200 - 25 - - - - - 256 - {{538, 357}, {211, 68}} - - YES - - 67239424 - 138543104 - T25seSBlbmFibGUgYSBoYWNrIHRvIGZpeCBhIHNwZWNpZmljIHByb2JsZW0gaW4gYSBnYW1lLgpIb2xk -IHRoZSBtb3VzZSBvdmVyIGEgY2hlY2tib3ggdG8gZ2V0IG1vcmUgaW5mb3JtYXRpb24gYWJvdXQgaXQu -A - - - YES - - - - - - - 256 - {{594, 431}, {106, 18}} - - YES - - 67239424 - 134217728 - Enable Hacks - - - 1211912703 - 2 - - - - 200 - 25 - - - - {781, 483} - - - {{0, 0}, {1440, 878}} - {283.341, 129} - {3.40282e+38, 3.40282e+38} - - - - YES - Draw Scanlines - Suckass - Fast mjpeg decoder - FPS Counter - Auto Full Screen - VSync - Enable Hacks - Propodrtional Resize - Offscreen Drawing - Dither Mode - Frame Buffer Level - Color Depth Level - Texture Color Depth Level - Texture Filter Level - Advanced Blending - Scanline Color - Frame Limit - Frame Skipping - Proportional Resize - Offscreen Drawing Level - GteAccuracy - - YES - - - - YES - - - YES - - - - - YES - - - nextKeyView - - - - 9 - - - - ok: - - - - 133 - - - - cancel: - - - - 134 - - - - reset: - - - - 135 - - - - fpsCounter - - - - 136 - - - - autoFullScreen - - - - 137 - - - - frameSkipping - - - - 138 - - - - hacksView - - - - 139 - - - - vSync - - - - 140 - - - - window - - - - 141 - - - - delegate - - - - 142 - - - - ditherMode - - - - 143 - - - - initialFirstResponder - - - - 145 - - - - hackEnable - - - - 229 - - - - fullscreenSize - - - - 231 - - - - offscreenDrawing - - - - 232 - - - - frameBufferEffects - - - - 233 - - - - drawScanlines - - - - 234 - - - - advancedBlending - - - - 235 - - - - opaquePass - - - - 236 - - - - wireframeOnly - - - - 237 - - - - blurEffect - - - - 238 - - - - mjpegDecoder - - - - 239 - - - - mjpegDecoder15bit - - - - 240 - - - - proportionalResize - - - - 241 - - - - texColorDepth - - - - 242 - - - - zMaskClipping - - - - 245 - - - - texEnhancment - - - - 276 - - - - texFiltering - - - - 277 - - - - value: selection.Fast mjpeg decoder - - - - - - value: selection.Fast mjpeg decoder - value - selection.Fast mjpeg decoder - 2 - - - 319 - - - - value: selection.Draw Scanlines - - - - - - value: selection.Draw Scanlines - value - selection.Draw Scanlines - 2 - - - 322 - - - - value: selection.FPS Counter - - - - - - value: selection.FPS Counter - value - selection.FPS Counter - 2 - - - 323 - - - - value: selection.Auto Full Screen - - - - - - value: selection.Auto Full Screen - value - selection.Auto Full Screen - 2 - - - 324 - - - - value: selection.VSync - - - - - - value: selection.VSync - value - selection.VSync - 2 - - - 325 - - - - value: selection.Enable Hacks - - - - - - value: selection.Enable Hacks - value - selection.Enable Hacks - 2 - - - 326 - - - - selectedIndex: selection.Dither Mode - - - - - - selectedIndex: selection.Dither Mode - selectedIndex - selection.Dither Mode - 2 - - - 329 - - - - selectedIndex: selection.Frame Buffer Level - - - - - - selectedIndex: selection.Frame Buffer Level - selectedIndex - selection.Frame Buffer Level - 2 - - - 330 - - - - selectedIndex: selection.Texture Color Depth Level - - - - - - selectedIndex: selection.Texture Color Depth Level - selectedIndex - selection.Texture Color Depth Level - 2 - - - 332 - - - - value: selection.Texture Filter Level - - - - - - value: selection.Texture Filter Level - value - selection.Texture Filter Level - 2 - - - 333 - - - - value: selection.Advanced Blending - - - - - - value: selection.Advanced Blending - value - selection.Advanced Blending - 2 - - - 334 - - - - value: selection.Opaque Pass - - - - - - value: selection.Opaque Pass - value - selection.Opaque Pass - 2 - - - 336 - - - - value: selection.Z Mask Clipping - - - - - - value: selection.Z Mask Clipping - value - selection.Z Mask Clipping - 2 - - - 337 - - - - value: selection.Wireframe Mode - - - - - - value: selection.Wireframe Mode - value - selection.Wireframe Mode - 2 - - - 338 - - - - value: selection.Blur - - - - - - value: selection.Blur - value - selection.Blur - 2 - - - 339 - - - - value: selection.Emulate mjpeg decoder - - - - - - value: selection.Emulate mjpeg decoder - value - selection.Emulate mjpeg decoder - 2 - - - 340 - - - - enabled: selection.Draw Scanlines - - - - - - enabled: selection.Draw Scanlines - enabled - selection.Draw Scanlines - 2 - - - 348 - - - - value: selection.Texture Enhancement Level - - - - - - value: selection.Texture Enhancement Level - value - selection.Texture Enhancement Level - 2 - - - 349 - - - - contentObject: values.net.sf.peops.GpuOpenGLPlugin Settings - - - - - - contentObject: values.net.sf.peops.GpuOpenGLPlugin Settings - contentObject - values.net.sf.peops.GpuOpenGLPlugin Settings - - NSHandlesContentAsCompoundValue - - - 2 - - - 353 - - - - value: selection.Scanline Color - - - - - - value: selection.Scanline Color - value - selection.Scanline Color - - NSValueTransformerName - NSUnarchiveFromData - - 2 - - - 354 - - - - hackToggle: - - - - 355 - - - - value: selection.Frame Limit - - - - - - value: selection.Frame Limit - value - selection.Frame Limit - 2 - - - 356 - - - - value: selection.Frame Skipping - - - - - - value: selection.Frame Skipping - value - selection.Frame Skipping - 2 - - - 357 - - - - value: selection.Proportional Resize - - - - - - value: selection.Proportional Resize - value - selection.Proportional Resize - 2 - - - 358 - - - - selectedIndex: selection.Offscreen Drawing Level - - - - - - selectedIndex: selection.Offscreen Drawing Level - selectedIndex - selection.Offscreen Drawing Level - 2 - - - 359 - - - - value: selection.GteAccuracy - - - - - - value: selection.GteAccuracy - value - selection.GteAccuracy - 2 - - - 408 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 5 - - - YES - - - - Window - - - 6 - - - YES - - - - - - - - - - - - - 7 - - - YES - - - - - - 8 - - - YES - - - - - - 10 - - - YES - - - - - - 76 - - - YES - - - - - - - - - - - - - - - 89 - - - YES - - - - - - - - - - - - - - 107 - - - YES - - - - - - - - - - - - - - - - - - - - - - 222 - - - YES - - - - - - 223 - - - YES - - - - - - 306 - - - - - 320 - - - - - 350 - - - Shared Defaults - - - 361 - - - - - 362 - - - - - 363 - - - - - 403 - - - - - 404 - - - - - -3 - - - Application - - - 75 - - - YES - - - - - - 365 - - - - - 80 - - - YES - - - - - - 368 - - - - - 79 - - - YES - - - - - - 367 - - - - - 82 - - - YES - - - - - - 369 - - - - - 78 - - - YES - - - - - - 366 - - - - - 73 - - - YES - - - - - - 364 - - - - - 147 - - - YES - - - - - - 370 - - - - - 148 - - - YES - - - - - - 371 - - - - - 149 - - - YES - - - - - - 372 - - - - - 150 - - - YES - - - - - - 373 - - - - - 93 - - - YES - - - - - - 374 - - - - - 96 - - - YES - - - - - - 375 - - - - - 97 - - - YES - - - - - - 376 - - - - - 99 - - - YES - - - - - - 377 - - - - - 162 - - - YES - - - - - - 378 - - - YES - - - - - - 163 - - - YES - - - - - - - - - - - - 164 - - - - - 165 - - - - - 166 - - - - - 246 - - - - - 247 - - - - - 248 - - - - - 249 - - - - - 168 - - - YES - - - - - - 379 - - - - - 177 - - - YES - - - - - - 380 - - - - - 187 - - - YES - - - - - - 381 - - - - - 214 - - - YES - - - - - - 382 - - - - - 112 - - - YES - - - - - - 383 - - - - - 116 - - - YES - - - - - - 384 - - - YES - - - - - - 113 - - - YES - - - - - - - - 111 - - - - - 114 - - - - - 115 - - - - - 175 - - - YES - - - - - - 385 - - - - - 178 - - - YES - - - - - - 386 - - - - - 179 - - - YES - - - - - - 387 - - - - - 180 - - - YES - - - - - - 388 - - - - - 181 - - - YES - - - - - - 389 - - - - - 182 - - - YES - - - - - - 390 - - - - - 183 - - - YES - - - - - - 391 - - - - - 185 - - - YES - - - - - - 392 - - - - - 202 - - - YES - - - - - - 393 - - - YES - - - - - - 203 - - - YES - - - - - - - - - - 204 - - - - - 205 - - - - - 206 - - - - - 254 - - - - - 255 - - - - - 207 - - - YES - - - - - - 394 - - - - - 212 - - - YES - - - - - - - - - - - 215 - - - YES - - - - - - 401 - - - YES - - - - - - 216 - - - YES - - - - - - - - 217 - - - - - 218 - - - - - 219 - - - - - 220 - - - YES - - - - - - 402 - - - - - 341 - - - - - 169 - - - YES - - - - - - 395 - - - YES - - - - - - 170 - - - YES - - - - - - - - - - 251 - - - - - 250 - - - - - 173 - - - - - 172 - - - - - 171 - - - - - 201 - - - YES - - - - - - 398 - - - - - 193 - - - YES - - - - - - 397 - - - - - 174 - - - YES - - - - - - 396 - - - - - 252 - - - YES - - - - - - 399 - - - - - 253 - - - YES - - - - - - 400 - - - - - 405 - - - YES - - - - - - 406 - - - - - - - YES - - YES - 10.IBPluginDependency - 10.ImportedFromIB2 - 107.IBAttributePlaceholdersKey - 107.IBPluginDependency - 107.ImportedFromIB2 - 111.IBPluginDependency - 111.ImportedFromIB2 - 112.IBAttributePlaceholdersKey - 112.IBPluginDependency - 112.ImportedFromIB2 - 113.IBPluginDependency - 113.ImportedFromIB2 - 114.IBPluginDependency - 114.ImportedFromIB2 - 115.IBPluginDependency - 115.ImportedFromIB2 - 116.IBAttributePlaceholdersKey - 116.IBPluginDependency - 116.ImportedFromIB2 - 147.IBAttributePlaceholdersKey - 147.IBPluginDependency - 147.ImportedFromIB2 - 148.IBAttributePlaceholdersKey - 148.IBPluginDependency - 148.ImportedFromIB2 - 149.IBAttributePlaceholdersKey - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBAttributePlaceholdersKey - 150.IBPluginDependency - 150.ImportedFromIB2 - 162.IBAttributePlaceholdersKey - 162.IBPluginDependency - 162.ImportedFromIB2 - 163.IBPluginDependency - 163.ImportedFromIB2 - 164.IBPluginDependency - 164.ImportedFromIB2 - 165.IBPluginDependency - 165.ImportedFromIB2 - 166.IBPluginDependency - 166.ImportedFromIB2 - 168.IBAttributePlaceholdersKey - 168.IBPluginDependency - 168.ImportedFromIB2 - 169.IBAttributePlaceholdersKey - 169.IBPluginDependency - 169.ImportedFromIB2 - 170.IBPluginDependency - 170.ImportedFromIB2 - 171.IBPluginDependency - 171.ImportedFromIB2 - 172.IBPluginDependency - 172.ImportedFromIB2 - 173.IBPluginDependency - 173.ImportedFromIB2 - 174.IBAttributePlaceholdersKey - 174.IBPluginDependency - 174.ImportedFromIB2 - 175.IBAttributePlaceholdersKey - 175.IBPluginDependency - 175.ImportedFromIB2 - 177.IBAttributePlaceholdersKey - 177.IBPluginDependency - 177.ImportedFromIB2 - 178.IBPluginDependency - 178.ImportedFromIB2 - 179.IBPluginDependency - 179.ImportedFromIB2 - 180.IBAttributePlaceholdersKey - 180.IBPluginDependency - 180.ImportedFromIB2 - 181.IBAttributePlaceholdersKey - 181.IBPluginDependency - 181.ImportedFromIB2 - 182.IBAttributePlaceholdersKey - 182.IBPluginDependency - 182.IBViewBoundsToFrameTransform - 182.ImportedFromIB2 - 183.IBAttributePlaceholdersKey - 183.IBPluginDependency - 183.ImportedFromIB2 - 185.IBAttributePlaceholdersKey - 185.IBPluginDependency - 185.ImportedFromIB2 - 187.IBPluginDependency - 187.ImportedFromIB2 - 193.IBAttributePlaceholdersKey - 193.IBPluginDependency - 193.ImportedFromIB2 - 201.IBAttributePlaceholdersKey - 201.IBPluginDependency - 201.ImportedFromIB2 - 202.IBAttributePlaceholdersKey - 202.IBPluginDependency - 202.ImportedFromIB2 - 203.IBPluginDependency - 203.ImportedFromIB2 - 204.IBPluginDependency - 204.ImportedFromIB2 - 205.IBPluginDependency - 205.ImportedFromIB2 - 206.IBPluginDependency - 206.ImportedFromIB2 - 207.IBAttributePlaceholdersKey - 207.IBPluginDependency - 207.ImportedFromIB2 - 212.IBPluginDependency - 212.ImportedFromIB2 - 214.IBAttributePlaceholdersKey - 214.IBPluginDependency - 214.ImportedFromIB2 - 215.IBPluginDependency - 215.ImportedFromIB2 - 216.IBPluginDependency - 216.ImportedFromIB2 - 217.IBPluginDependency - 217.ImportedFromIB2 - 218.IBPluginDependency - 218.ImportedFromIB2 - 219.IBPluginDependency - 219.ImportedFromIB2 - 220.IBAttributePlaceholdersKey - 220.IBPluginDependency - 220.ImportedFromIB2 - 222.IBPluginDependency - 222.ImportedFromIB2 - 223.IBPluginDependency - 223.ImportedFromIB2 - 246.IBPluginDependency - 246.ImportedFromIB2 - 247.IBPluginDependency - 247.ImportedFromIB2 - 248.IBPluginDependency - 248.ImportedFromIB2 - 249.IBPluginDependency - 249.ImportedFromIB2 - 250.IBPluginDependency - 250.ImportedFromIB2 - 251.IBPluginDependency - 251.ImportedFromIB2 - 252.IBAttributePlaceholdersKey - 252.IBPluginDependency - 252.ImportedFromIB2 - 253.IBAttributePlaceholdersKey - 253.IBPluginDependency - 253.ImportedFromIB2 - 254.IBPluginDependency - 254.ImportedFromIB2 - 255.IBPluginDependency - 255.ImportedFromIB2 - 306.IBPluginDependency - 306.ImportedFromIB2 - 320.IBPluginDependency - 320.ImportedFromIB2 - 341.IBAttributePlaceholdersKey - 341.IBPluginDependency - 341.ImportedFromIB2 - 350.IBPluginDependency - 350.ImportedFromIB2 - 405.IBAttributePlaceholdersKey - 405.IBPluginDependency - 405.ImportedFromIB2 - 5.IBEditorWindowLastContentRect - 5.IBPluginDependency - 5.IBWindowTemplateEditedContentRect - 5.ImportedFromIB2 - 5.windowTemplate.hasMinSize - 5.windowTemplate.minSize - 6.IBPluginDependency - 6.ImportedFromIB2 - 7.IBPluginDependency - 7.ImportedFromIB2 - 73.IBAttributePlaceholdersKey - 73.IBPluginDependency - 73.ImportedFromIB2 - 75.IBAttributePlaceholdersKey - 75.IBPluginDependency - 75.ImportedFromIB2 - 76.IBPluginDependency - 76.ImportedFromIB2 - 78.IBAttributePlaceholdersKey - 78.IBPluginDependency - 78.ImportedFromIB2 - 79.IBAttributePlaceholdersKey - 79.IBPluginDependency - 79.ImportedFromIB2 - 8.IBPluginDependency - 8.ImportedFromIB2 - 80.IBAttributePlaceholdersKey - 80.IBPluginDependency - 80.ImportedFromIB2 - 82.IBAttributePlaceholdersKey - 82.IBPluginDependency - 82.ImportedFromIB2 - 89.IBPluginDependency - 89.ImportedFromIB2 - 93.IBAttributePlaceholdersKey - 93.IBPluginDependency - 93.ImportedFromIB2 - 96.IBAttributePlaceholdersKey - 96.IBPluginDependency - 96.ImportedFromIB2 - 97.IBAttributePlaceholdersKey - 97.IBPluginDependency - 97.ImportedFromIB2 - 99.IBAttributePlaceholdersKey - 99.IBPluginDependency - 99.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - If your card supports it, will mix textures more accurately - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Specify when to use dithering to render colors - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Specify when to use dithering to render colors - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Chrono Cross - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Slightly distorted textures can happen - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Needed by Dark Forces - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Toggles busy flags after drawing - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Change resolution to this when going full screen - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Change resolution to this when going full screen - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - The color depth of stored textures. - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - The color depth of stored textures. - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Transforms your playstation into a wireframe game - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Cap the frames per second so emulation doesn't get outta hand - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Enables the primitive z-buffer which masks polygons from bleeding - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Check this to emulate the special movie decoder - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Enabling this will use a faster motion jpeg codec with some quality loss - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDrwAAwfgAAA - - - - ToolTip - - ToolTip - - Draws TV-like scan lines over the display - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - When enabled, renders an almost unnoticeable "motion blur" - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Select a quality level of texture scaling - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Use offscreen drawing to remove some graphics glitches - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Use offscreen drawing to remove some graphics glitches - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - When checked, will keep the PSX display at natural aspect ratio - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Select the method the PSX uses to read the contents of the screen - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Filter textures when scaled. Higher values filter more kinds of textures, i.e. sprites. - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Select a quality level of texture scaling - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Select a color and transparency for the scanlines - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Enabling this will use a faster motion jpeg codec with some quality loss - - - com.apple.InterfaceBuilder.CocoaPlugin - - {{329, 362}, {781, 483}} - com.apple.InterfaceBuilder.CocoaPlugin - {{329, 362}, {781, 483}} - - - {283.341, 107} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Fixes black screens in Lunar - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Better fps limitation with some games - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Old compatibility mode - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Better fps limitation with some games - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Shows the full area in Capcom 2D fighters - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Maybe faster, needed for Pandemonium 2 - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - 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. - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Skip rendering frames to improve overall speed when needed. This setting might cause compatibility problems - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - When Enabled a small counter will show the current performance of the rendering measured in Frames Per Second (FPS) - - - com.apple.InterfaceBuilder.CocoaPlugin - - - ToolTip - - ToolTip - - Automatically enter full screen mode - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - - YES - - - - - YES - - - YES - - - - 408 - - - - YES - - FirstResponder - NSObject - - : - id - - - : - - : - id - - - - IBUserSource - - - - - NetSfPeopsOpenGLPluginConfigController - NSWindowController - - YES - - YES - cancel: - hackToggle: - ok: - reset: - - - YES - id - id - id - id - - - - YES - - YES - cancel: - hackToggle: - ok: - reset: - - - YES - - cancel: - id - - - hackToggle: - id - - - ok: - id - - - reset: - id - - - - - YES - - YES - advancedBlending - autoFullScreen - blurEffect - ditherMode - drawScanlines - fpsCounter - frameBufferEffects - frameSkipping - fullscreenSize - gteAccuracy - hackEnable - hacksView - mjpegDecoder - mjpegDecoder15bit - offscreenDrawing - opaquePass - proportionalResize - texColorDepth - texEnhancment - texFiltering - vSync - windowSize - wireframeOnly - zMaskClipping - - - YES - NSControl - NSControl - NSControl - NSPopUpButton - NSControl - NSControl - NSPopUpButton - NSControl - NSPopUpButton - NSControl - NSControl - NSView - NSControl - NSControl - NSPopUpButton - NSControl - NSControl - NSPopUpButton - NSSlider - NSSlider - NSControl - NSPopUpButton - NSControl - NSControl - - - - YES - - YES - advancedBlending - autoFullScreen - blurEffect - ditherMode - drawScanlines - fpsCounter - frameBufferEffects - frameSkipping - fullscreenSize - gteAccuracy - hackEnable - hacksView - mjpegDecoder - mjpegDecoder15bit - offscreenDrawing - opaquePass - proportionalResize - texColorDepth - texEnhancment - texFiltering - vSync - windowSize - wireframeOnly - zMaskClipping - - - YES - - advancedBlending - NSControl - - - autoFullScreen - NSControl - - - blurEffect - NSControl - - - ditherMode - NSPopUpButton - - - drawScanlines - NSControl - - - fpsCounter - NSControl - - - frameBufferEffects - NSPopUpButton - - - frameSkipping - NSControl - - - fullscreenSize - NSPopUpButton - - - gteAccuracy - NSControl - - - hackEnable - NSControl - - - hacksView - NSView - - - mjpegDecoder - NSControl - - - mjpegDecoder15bit - NSControl - - - offscreenDrawing - NSPopUpButton - - - opaquePass - NSControl - - - proportionalResize - NSControl - - - texColorDepth - NSPopUpButton - - - texEnhancment - NSSlider - - - texFiltering - NSSlider - - - vSync - NSControl - - - windowSize - NSPopUpButton - - - wireframeOnly - NSControl - - - zMaskClipping - NSControl - - - - - IBProjectSource - macsrc/NetSfPeopsOpenGLPluginConfigController.h - - - - NetSfPeopsOpenGLPluginConfigController - NSWindowController - - IBUserSource - - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - NSSwitch - - - YES - {9, 8} - {7, 2} - {15, 15} - - - - 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 @@ - - - - - IBDocumentLocation - 115 92 561 249 0 0 1440 878 - IBFramework Version - 489.0 - IBOpenObjects - - 5 - - IBSystem Version - 8S2167 - - 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 @@ - - - - - IBDocumentLocation - 99 26 409 240 0 0 1024 746 - IBFramework Version - 489.0 - IBOpenObjects - - 5 - - IBSystem Version - 8S2167 - - 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 = ""; }; + 28586CBF14651E560082B8EC /* NetSfPeopsOpenGLGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsOpenGLGPUInterface.xib; sourceTree = ""; }; + 28B467F91463DA5B0083F129 /* drawgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = drawgl.h; path = macsrc/drawgl.h; sourceTree = ""; }; 2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2B51949E06B3D2D200744730 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = ""; }; @@ -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 = ""; }; 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 = ""; + }; 2B038C05069183300082466B /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -269,18 +283,10 @@ name = Credits.rtf; sourceTree = ""; }; - 3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */ = { - isa = PBXVariantGroup; - children = ( - 3F7F3807130799CA00556C34 /* English */, - ); - name = NetSfPeopsOpenGLConfig.nib; - sourceTree = ""; - }; /* 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 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]; } -- cgit v1.2.3