diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-03 06:57:46 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-03 06:57:46 +0000 |
| commit | f557fb4d2b84e5948f54a5fbb0a645a5f97b83dd (patch) | |
| tree | 79d17d1962e4c0927dfafedb65107f473952d33c /macosx/plugins/DFSound | |
| parent | 3b35614dd7a9cd014993931f3576e22b91e8820e (diff) | |
| download | pcsxr-f557fb4d2b84e5948f54a5fbb0a645a5f97b83dd.tar.gz | |
Get rid of the messy preprocessor hack for named sliders on the audio plug-ins for OS X:
Consolidate files that are the same.
Whatever class loads a nib, will be that owner, no matter what the nib says.
Have shared code be in a dylib that loads, so there isn't warnings about conflicting classes.
Other changes
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85757 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFSound')
13 files changed, 493 insertions, 1406 deletions
diff --git a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj index 3886f1ff..0cf94129 100644 --- a/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFSound/PeopsSPU.xcodeproj/project.pbxproj @@ -9,18 +9,25 @@ /* Begin PBXBuildFile section */ 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 */; }; - 5506636A14AB91C100C7C565 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5506635814AB91C100C7C565 /* Credits.rtf */; }; 5506636C14AB91C100C7C565 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506635A14AB91C100C7C565 /* InfoPlist.strings */; }; - 5506636E14AB91C100C7C565 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506635C14AB91C100C7C565 /* Localizable.strings */; }; - 5506637114AB91C100C7C565 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5506636114AB91C100C7C565 /* Credits.rtf */; }; 5506637314AB91C100C7C565 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506636314AB91C100C7C565 /* InfoPlist.strings */; }; - 5506637514AB91C100C7C565 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5506636514AB91C100C7C565 /* Localizable.strings */; }; - 5506637714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */; }; - 5506639A14AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */; }; + 554588461783DF39008A7407 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 554588451783DF39008A7407 /* Cocoa.framework */; }; + 554588541783DF87008A7407 /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; }; + 554588551783DF8B008A7407 /* NamedSlider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */; }; + 554588581783DFE0008A7407 /* libSPUSharedCode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; }; + 5545885A1783DFFE008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; }; + 5545885D1783E00E008A7407 /* libSPUSharedCode.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; }; + 5545885F1783E020008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; }; + 554588701783E5FE008A7407 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5545886A1783E5FE008A7407 /* Credits.rtf */; }; + 554588711783E5FE008A7407 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 5545886A1783E5FE008A7407 /* Credits.rtf */; }; + 554588721783E5FE008A7407 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5545886C1783E5FE008A7407 /* Localizable.strings */; }; + 554588731783E5FE008A7407 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5545886C1783E5FE008A7407 /* Localizable.strings */; }; + 554588741783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */; }; + 554588751783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */; }; + 554588781783F2E3008A7407 /* SPUPluginController.h in Headers */ = {isa = PBXBuildFile; fileRef = 554588761783F2E3008A7407 /* SPUPluginController.h */; }; + 554588791783F2E3008A7407 /* SPUPluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 554588771783F2E3008A7407 /* SPUPluginController.m */; }; 5599693C13AFCD2900B0216B /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2B92072D9BE6007F0C35 /* PluginController.m */; }; - 5599693D13AFCD2900B0216B /* NamedSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */; }; 5599693E13AFCD2900B0216B /* dma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E797109DC529003BB7AC /* dma.c */; }; 5599693F13AFCD2900B0216B /* freeze.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E79B109DC529003BB7AC /* freeze.c */; }; 5599694013AFCD2900B0216B /* registers.c in Sources */ = {isa = PBXBuildFile; fileRef = 71E4E79F109DC529003BB7AC /* registers.c */; }; @@ -59,23 +66,69 @@ A1A2073E13816B1D005EE84C /* externals.c in Sources */ = {isa = PBXBuildFile; fileRef = A1A2073D13816B1D005EE84C /* externals.c */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 554588561783DFD9008A7407 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 554588421783DF39008A7407; + remoteInfo = PCSXRNamedSliders; + }; + 5545885B1783E00A008A7407 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 554588421783DF39008A7407; + remoteInfo = PCSXRNamedSliders; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 554588591783DFE6008A7407 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 5545885A1783DFFE008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; + 5545885E1783E015008A7407 /* Copy Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 5545885F1783E020008A7407 /* libSPUSharedCode.dylib in Copy Frameworks */, + ); + name = "Copy Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; - 2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; }; - 2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; }; + 2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PluginController.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; }; 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NamedSlider.h; sourceTree = "<group>"; }; 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NamedSlider.m; sourceTree = "<group>"; }; 2BFF7F3D0715D2E00061278A /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; - 5506635914AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; 5506635B14AB91C100C7C565 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - 5506635D14AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; - 5506636214AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; 5506636414AB91C100C7C565 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - 5506636614AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; - 5506636814AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuSDLPluginMain.xib; sourceTree = "<group>"; }; - 5506639914AB9E0300C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuALPluginMain.xib; sourceTree = "<group>"; }; 5517C065136217DE00706CCF /* externals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = externals.c; sourceTree = "<group>"; }; + 554588431783DF39008A7407 /* libSPUSharedCode.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libSPUSharedCode.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; + 554588451783DF39008A7407 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 554588481783DF39008A7407 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 554588491783DF39008A7407 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; + 5545884A1783DF39008A7407 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; + 5545886B1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; }; + 5545886D1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; }; + 5545886F1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.xib; sourceTree = "<group>"; }; + 554588761783F2E3008A7407 /* SPUPluginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUPluginController.h; sourceTree = "<group>"; }; + 554588771783F2E3008A7407 /* SPUPluginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUPluginController.m; sourceTree = "<group>"; }; 5599692713AFCCC600B0216B /* openal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openal.c; sourceTree = "<group>"; }; 5599695E13AFCD2900B0216B /* PeopsSpuAL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsSpuAL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; }; 5599696E13AFCE1D00B0216B /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; @@ -152,10 +205,19 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 554588401783DF39008A7407 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 554588461783DF39008A7407 /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5599695413AFCD2900B0216B /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 5545885D1783E00E008A7407 /* libSPUSharedCode.dylib in Frameworks */, 5599695513AFCD2900B0216B /* CoreFoundation.framework in Frameworks */, 5599695713AFCD2900B0216B /* AppKit.framework in Frameworks */, 5599696F13AFCE1D00B0216B /* OpenAL.framework in Frameworks */, @@ -166,6 +228,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 554588581783DFE0008A7407 /* libSPUSharedCode.dylib in Frameworks */, 8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */, 2BFF7F3E0715D2E00061278A /* Carbon.framework in Frameworks */, 2B7B2BD1072DAE5D007F0C35 /* AppKit.framework in Frameworks */, @@ -186,6 +249,7 @@ 089C167CFE841241C02AAC07 /* Resources */, 71C7B1C0130F340E004BF975 /* SDL */, 089C1671FE841209C02AAC07 /* External Frameworks and Libraries */, + 554588441783DF39008A7407 /* Frameworks */, 19C28FB6FE9D52B211CA2CBB /* Products */, 8D576317048677EA00EA77CD /* Info-SDL.plist */, 55C8AB0C146DCD0E005ACCCB /* Info-AL.plist */, @@ -210,6 +274,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 554588691783E5FE008A7407 /* Shared */, 5506635714AB91C100C7C565 /* OpenAL */, 5506636014AB91C100C7C565 /* SDL */, ); @@ -254,6 +319,7 @@ children = ( 8D576316048677EA00EA77CD /* PeopsSpuSDL.psxplugin */, 5599695E13AFCD2900B0216B /* PeopsSpuAL.psxplugin */, + 554588431783DF39008A7407 /* libSPUSharedCode.dylib */, ); name = Products; sourceTree = "<group>"; @@ -266,6 +332,8 @@ 2B7B2B92072D9BE6007F0C35 /* PluginController.m */, 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */, 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */, + 554588761783F2E3008A7407 /* SPUPluginController.h */, + 554588771783F2E3008A7407 /* SPUPluginController.m */, ); path = macsrc; sourceTree = "<group>"; @@ -273,10 +341,7 @@ 5506635714AB91C100C7C565 /* OpenAL */ = { isa = PBXGroup; children = ( - 5506635814AB91C100C7C565 /* Credits.rtf */, 5506635A14AB91C100C7C565 /* InfoPlist.strings */, - 5506635C14AB91C100C7C565 /* Localizable.strings */, - 5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */, ); path = OpenAL; sourceTree = "<group>"; @@ -284,14 +349,40 @@ 5506636014AB91C100C7C565 /* SDL */ = { isa = PBXGroup; children = ( - 5506636114AB91C100C7C565 /* Credits.rtf */, 5506636314AB91C100C7C565 /* InfoPlist.strings */, - 5506636514AB91C100C7C565 /* Localizable.strings */, - 5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */, ); path = SDL; sourceTree = "<group>"; }; + 554588441783DF39008A7407 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 554588451783DF39008A7407 /* Cocoa.framework */, + 554588471783DF39008A7407 /* Other Frameworks */, + ); + name = Frameworks; + sourceTree = "<group>"; + }; + 554588471783DF39008A7407 /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 554588481783DF39008A7407 /* AppKit.framework */, + 554588491783DF39008A7407 /* CoreData.framework */, + 5545884A1783DF39008A7407 /* Foundation.framework */, + ); + name = "Other Frameworks"; + sourceTree = "<group>"; + }; + 554588691783E5FE008A7407 /* Shared */ = { + isa = PBXGroup; + children = ( + 5545886A1783E5FE008A7407 /* Credits.rtf */, + 5545886C1783E5FE008A7407 /* Localizable.strings */, + 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */, + ); + path = Shared; + sourceTree = "<group>"; + }; 71C7B1C0130F340E004BF975 /* SDL */ = { isa = PBXGroup; children = ( @@ -407,7 +498,36 @@ }; /* End PBXGroup section */ +/* Begin PBXHeadersBuildPhase section */ + 554588411783DF39008A7407 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 554588551783DF8B008A7407 /* NamedSlider.h in Headers */, + 554588781783F2E3008A7407 /* SPUPluginController.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + /* Begin PBXNativeTarget section */ + 554588421783DF39008A7407 /* SPUSharedCode */ = { + isa = PBXNativeTarget; + buildConfigurationList = 554588531783DF39008A7407 /* Build configuration list for PBXNativeTarget "SPUSharedCode" */; + buildPhases = ( + 5545883F1783DF39008A7407 /* Sources */, + 554588401783DF39008A7407 /* Frameworks */, + 554588411783DF39008A7407 /* Headers */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = SPUSharedCode; + productName = PCSXRNamedSliders; + productReference = 554588431783DF39008A7407 /* libSPUSharedCode.dylib */; + productType = "com.apple.product-type.library.dynamic"; + }; 5599693613AFCD2900B0216B /* PeopsSpuAL */ = { isa = PBXNativeTarget; buildConfigurationList = 5599695B13AFCD2900B0216B /* Build configuration list for PBXNativeTarget "PeopsSpuAL" */; @@ -415,10 +535,12 @@ 5599693713AFCD2900B0216B /* Resources */, 5599693B13AFCD2900B0216B /* Sources */, 5599695413AFCD2900B0216B /* Frameworks */, + 5545885E1783E015008A7407 /* Copy Frameworks */, ); buildRules = ( ); dependencies = ( + 5545885C1783E00A008A7407 /* PBXTargetDependency */, ); name = PeopsSpuAL; productInstallPath = "$(HOME)/Library/Bundles"; @@ -433,10 +555,12 @@ 8D57630F048677EA00EA77CD /* Resources */, 8D576311048677EA00EA77CD /* Sources */, 8D576313048677EA00EA77CD /* Frameworks */, + 554588591783DFE6008A7407 /* Copy Frameworks */, ); buildRules = ( ); dependencies = ( + 554588571783DFD9008A7407 /* PBXTargetDependency */, ); name = PeopsSpuSDL; productInstallPath = "$(HOME)/Library/Bundles"; @@ -468,6 +592,7 @@ targets = ( 8D57630D048677EA00EA77CD /* PeopsSpuSDL */, 5599693613AFCD2900B0216B /* PeopsSpuAL */, + 554588421783DF39008A7407 /* SPUSharedCode */, ); }; /* End PBXProject section */ @@ -477,10 +602,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5506636A14AB91C100C7C565 /* Credits.rtf in Resources */, 5506636C14AB91C100C7C565 /* InfoPlist.strings in Resources */, - 5506636E14AB91C100C7C565 /* Localizable.strings in Resources */, - 5506639A14AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib in Resources */, + 554588711783E5FE008A7407 /* Credits.rtf in Resources */, + 554588731783E5FE008A7407 /* Localizable.strings in Resources */, + 554588751783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -488,22 +613,30 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 5506637114AB91C100C7C565 /* Credits.rtf in Resources */, 5506637314AB91C100C7C565 /* InfoPlist.strings in Resources */, - 5506637514AB91C100C7C565 /* Localizable.strings in Resources */, - 5506637714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib in Resources */, + 554588701783E5FE008A7407 /* Credits.rtf in Resources */, + 554588721783E5FE008A7407 /* Localizable.strings in Resources */, + 554588741783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 5545883F1783DF39008A7407 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 554588541783DF87008A7407 /* NamedSlider.m in Sources */, + 554588791783F2E3008A7407 /* SPUPluginController.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5599693B13AFCD2900B0216B /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( 5599693C13AFCD2900B0216B /* PluginController.m in Sources */, - 5599693D13AFCD2900B0216B /* NamedSlider.m in Sources */, 5599693E13AFCD2900B0216B /* dma.c in Sources */, 5599693F13AFCD2900B0216B /* freeze.c in Sources */, 5599694013AFCD2900B0216B /* registers.c in Sources */, @@ -519,7 +652,6 @@ buildActionMask = 2147483647; files = ( 2B7B2B94072D9BE6007F0C35 /* PluginController.m in Sources */, - 2B7B2BE9072DB1B6007F0C35 /* NamedSlider.m in Sources */, 71E4E7AB109DC529003BB7AC /* dma.c in Sources */, 71E4E7AC109DC529003BB7AC /* freeze.c in Sources */, 71E4E7AE109DC529003BB7AC /* registers.c in Sources */, @@ -547,15 +679,20 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 554588571783DFD9008A7407 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 554588421783DF39008A7407 /* SPUSharedCode */; + targetProxy = 554588561783DFD9008A7407 /* PBXContainerItemProxy */; + }; + 5545885C1783E00A008A7407 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 554588421783DF39008A7407 /* SPUSharedCode */; + targetProxy = 5545885B1783E00A008A7407 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin PBXVariantGroup section */ - 5506635814AB91C100C7C565 /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - 5506635914AB91C100C7C565 /* English */, - ); - name = Credits.rtf; - sourceTree = "<group>"; - }; 5506635A14AB91C100C7C565 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -564,22 +701,6 @@ name = InfoPlist.strings; sourceTree = "<group>"; }; - 5506635C14AB91C100C7C565 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - 5506635D14AB91C100C7C565 /* English */, - ); - name = Localizable.strings; - sourceTree = "<group>"; - }; - 5506636114AB91C100C7C565 /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - 5506636214AB91C100C7C565 /* English */, - ); - name = Credits.rtf; - sourceTree = "<group>"; - }; 5506636314AB91C100C7C565 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -588,33 +709,75 @@ name = InfoPlist.strings; sourceTree = "<group>"; }; - 5506636514AB91C100C7C565 /* Localizable.strings */ = { + 5545886A1783E5FE008A7407 /* Credits.rtf */ = { isa = PBXVariantGroup; children = ( - 5506636614AB91C100C7C565 /* English */, + 5545886B1783E5FE008A7407 /* English */, ); - name = Localizable.strings; + name = Credits.rtf; sourceTree = "<group>"; }; - 5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */ = { + 5545886C1783E5FE008A7407 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( - 5506636814AB91C100C7C565 /* English */, + 5545886D1783E5FE008A7407 /* English */, ); - name = NetSfPeopsSpuSDLPluginMain.xib; + name = Localizable.strings; sourceTree = "<group>"; }; - 5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */ = { + 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */ = { isa = PBXVariantGroup; children = ( - 5506639914AB9E0300C7C565 /* English */, + 5545886F1783E5FE008A7407 /* English */, ); - name = NetSfPeopsSpuALPluginMain.xib; + name = NetSfPeopsSpuPluginMain.xib; sourceTree = "<group>"; }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ + 554588511783DF39008A7407 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_EMPTY_BODY = YES; + COPY_PHASE_STRIP = NO; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + EXECUTABLE_PREFIX = lib; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + INSTALL_PATH = "@rpath"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 554588521783DF39008A7407 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_WARN_EMPTY_BODY = YES; + COPY_PHASE_STRIP = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + EXECUTABLE_PREFIX = lib; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + INSTALL_PATH = "@rpath"; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; 5599695C13AFCD2900B0216B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -624,9 +787,10 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=ALsound", + "PCSXRPLUG=ALSound", _MACOSX, USEOPENAL, + "$(inherited)", ); HEADER_SEARCH_PATHS = ( src/, @@ -634,6 +798,7 @@ ); INFOPLIST_FILE = "Info-AL.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; PRODUCT_NAME = PeopsSpuAL; SYMROOT = ../../build; WRAPPER_EXTENSION = psxplugin; @@ -648,9 +813,10 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=ALsound", + "PCSXRPLUG=ALSound", _MACOSX, USEOPENAL, + "$(inherited)", ); HEADER_SEARCH_PATHS = ( src/, @@ -658,6 +824,7 @@ ); INFOPLIST_FILE = "Info-AL.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; PRODUCT_NAME = PeopsSpuAL; SYMROOT = ../../build; WRAPPER_EXTENSION = psxplugin; @@ -673,10 +840,11 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=SPUSound", + "PCSXRPLUG=SDLSound", _MACOSX, USESDL, SDL_JOYSTICK_DISABLED, + "$(inherited)", ); HEADER_SEARCH_PATHS = ( src/, @@ -685,6 +853,8 @@ ); INFOPLIST_FILE = "Info-SDL.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = PeopsSpuSDL; SYMROOT = ../../build; WRAPPER_EXTENSION = psxplugin; @@ -699,10 +869,11 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_OPTIMIZATION_LEVEL = s; GCC_PREPROCESSOR_DEFINITIONS = ( - "PCSXRPLUG=SPUSound", + "PCSXRPLUG=SDLSound", _MACOSX, USESDL, SDL_JOYSTICK_DISABLED, + "$(inherited)", ); HEADER_SEARCH_PATHS = ( src/, @@ -711,6 +882,8 @@ ); INFOPLIST_FILE = "Info-SDL.plist"; INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = PeopsSpuSDL; SYMROOT = ../../build; WRAPPER_EXTENSION = psxplugin; @@ -727,6 +900,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -763,6 +937,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 554588531783DF39008A7407 /* Build configuration list for PBXNativeTarget "SPUSharedCode" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 554588511783DF39008A7407 /* Debug */, + 554588521783DF39008A7407 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 5599695B13AFCD2900B0216B /* Build configuration list for PBXNativeTarget "PeopsSpuAL" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/NetSfPeopsSpuALPluginMain.xib b/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/NetSfPeopsSpuALPluginMain.xib deleted file mode 100644 index bbae5fad..00000000 --- a/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/NetSfPeopsSpuALPluginMain.xib +++ /dev/null @@ -1,1153 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> - <data> - <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">11C74</string> - <string key="IBDocument.InterfaceBuilderVersion">1938</string> - <string key="IBDocument.AppKitVersion">1138.23</string> - <string key="IBDocument.HIToolboxVersion">567.00</string> - <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">1938</string> - </object> - <array key="IBDocument.IntegratedClassDependencies"> - <string>NSView</string> - <string>NSCustomObject</string> - <string>NSWindowTemplate</string> - <string>NSTextField</string> - <string>NSTextFieldCell</string> - <string>NSSliderCell</string> - <string>NSSlider</string> - <string>NSButtonCell</string> - <string>NSButton</string> - <string>NSBox</string> - </array> - <array key="IBDocument.PluginDependencies"> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </array> - <object class="NSMutableDictionary" key="IBDocument.Metadata"> - <string key="NS.key.0">PluginDependencyRecalculationVersion</string> - <integer value="1" key="NS.object.0"/> - </object> - <array class="NSMutableArray" key="IBDocument.RootObjects" id="1003241861"> - <object class="NSCustomObject" id="758282330"> - <string key="NSClassName">NetSfPeopsSPUALPluginController</string> - </object> - <object class="NSCustomObject" id="438626275"> - <string key="NSClassName">FirstResponder</string> - </object> - <object class="NSCustomObject" id="225882746"> - <string key="NSClassName">NSApplication</string> - </object> - <object class="NSWindowTemplate" id="980713848"> - <int key="NSWindowStyleMask">1</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{128, 348}, {466, 337}}</string> - <int key="NSWTFlags">1886912512</int> - <string key="NSWindowTitle">SPU Configuration</string> - <string key="NSWindowClass">NSWindow</string> - <object class="NSMutableString" key="NSViewClass"> - <characters key="NS.bytes">View</characters> - </object> - <nil key="NSUserInterfaceItemIdentifier"/> - <string key="NSWindowContentMinSize">{213, 107}</string> - <object class="NSView" key="NSWindowView" id="335490069"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">256</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSBox" id="988321145"> - <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSView" id="517400347"> - <reference key="NSNextResponder" ref="988321145"/> - <int key="NSvFlags">274</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSTextField" id="121836166"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 86}, {96, 17}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="1507912"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="429556832"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Reverb:</string> - <object class="NSFont" key="NSSupport" id="535632823"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">13</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="121836166"/> - <object class="NSColor" key="NSBackgroundColor" id="498551882"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor" id="823702402"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">controlTextColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MAA</bytes> - </object> - </object> - </object> - </object> - <object class="NSSlider" id="1507912"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{127, 84}, {144, 26}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="184943800"/> - <bool key="NSEnabled">YES</bool> - <object class="NSSliderCell" key="NSCell" id="724216678"> - <int key="NSCellFlags">67501824</int> - <int key="NSCellFlags2">0</int> - <object class="NSMutableString" key="NSContents"> - <characters key="NS.bytes"/> - </object> - <object class="NSFont" key="NSSupport" id="922333135"> - <string key="NSName">Helvetica</string> - <double key="NSSize">12</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="1507912"/> - <double key="NSMaxValue">2</double> - <double key="NSMinValue">0.0</double> - <double key="NSValue">1</double> - <double key="NSAltIncValue">0.0</double> - <int key="NSNumberOfTickMarks">3</int> - <int key="NSTickMarkPosition">1</int> - <bool key="NSAllowsTickMarkValuesOnly">YES</bool> - <bool key="NSVertical">NO</bool> - </object> - </object> - <object class="NSTextField" id="197077555"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 54}, {96, 17}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="398137737"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="74472058"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Interpolation:</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="197077555"/> - <reference key="NSBackgroundColor" ref="498551882"/> - <reference key="NSTextColor" ref="823702402"/> - </object> - </object> - <object class="NSSlider" id="398137737"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{127, 52}, {144, 26}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="261829518"/> - <bool key="NSEnabled">YES</bool> - <object class="NSSliderCell" key="NSCell" id="827693569"> - <int key="NSCellFlags">67501824</int> - <int key="NSCellFlags2">0</int> - <object class="NSMutableString" key="NSContents"> - <characters key="NS.bytes"/> - </object> - <reference key="NSSupport" ref="922333135"/> - <reference key="NSControlView" ref="398137737"/> - <double key="NSMaxValue">3</double> - <double key="NSMinValue">0.0</double> - <double key="NSValue">1</double> - <double key="NSAltIncValue">0.0</double> - <int key="NSNumberOfTickMarks">4</int> - <int key="NSTickMarkPosition">1</int> - <bool key="NSAllowsTickMarkValuesOnly">YES</bool> - <bool key="NSVertical">NO</bool> - </object> - </object> - <object class="NSTextField" id="184943800"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{274, 83}, {133, 17}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="197077555"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="909159478"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">71303168</int> - <string key="NSContents">(Simple Reverb)</string> - <object class="NSFont" key="NSSupport" id="26"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> - <int key="NSfFlags">3100</int> - </object> - <reference key="NSControlView" ref="184943800"/> - <reference key="NSBackgroundColor" ref="498551882"/> - <reference key="NSTextColor" ref="823702402"/> - </object> - </object> - <object class="NSTextField" id="261829518"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{274, 51}, {133, 17}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="74783790"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="336300577"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">71303168</int> - <string key="NSContents">(Simple Interpolation)</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="261829518"/> - <reference key="NSBackgroundColor" ref="498551882"/> - <reference key="NSTextColor" ref="823702402"/> - </object> - </object> - <object class="NSTextField" id="74783790"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{13, 21}, {96, 17}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="1011324224"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="902474361"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">4194304</int> - <string key="NSContents">Volume:</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="74783790"/> - <reference key="NSBackgroundColor" ref="498551882"/> - <reference key="NSTextColor" ref="823702402"/> - </object> - </object> - <object class="NSSlider" id="1011324224"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{127, 19}, {144, 26}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="387662915"/> - <bool key="NSEnabled">YES</bool> - <object class="NSSliderCell" key="NSCell" id="846739879"> - <int key="NSCellFlags">67501824</int> - <int key="NSCellFlags2">0</int> - <object class="NSMutableString" key="NSContents"> - <characters key="NS.bytes"/> - </object> - <reference key="NSSupport" ref="922333135"/> - <reference key="NSControlView" ref="1011324224"/> - <double key="NSMaxValue">4</double> - <double key="NSMinValue">0.0</double> - <double key="NSValue">3</double> - <double key="NSAltIncValue">0.0</double> - <int key="NSNumberOfTickMarks">5</int> - <int key="NSTickMarkPosition">1</int> - <bool key="NSAllowsTickMarkValuesOnly">YES</bool> - <bool key="NSVertical">NO</bool> - </object> - </object> - <object class="NSTextField" id="387662915"> - <reference key="NSNextResponder" ref="517400347"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{274, 18}, {133, 17}}</string> - <reference key="NSSuperview" ref="517400347"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="759155340"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="723960494"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">71303168</int> - <string key="NSContents">(Loud)</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="387662915"/> - <reference key="NSBackgroundColor" ref="498551882"/> - <reference key="NSTextColor" ref="823702402"/> - </object> - </object> - </array> - <string key="NSFrame">{{2, 2}, {428, 127}}</string> - <reference key="NSSuperview" ref="988321145"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="121836166"/> - </object> - </array> - <string key="NSFrame">{{17, 173}, {432, 144}}</string> - <reference key="NSSuperview" ref="335490069"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="517400347"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">General Settings</string> - <reference key="NSSupport" ref="26"/> - <object class="NSColor" key="NSBackgroundColor" id="597649983"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - </object> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="517400347"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSBox" id="773092047"> - <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSView" id="757061322"> - <reference key="NSNextResponder" ref="773092047"/> - <int key="NSvFlags">274</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSButton" id="759409224"> - <reference key="NSNextResponder" ref="757061322"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{21, 60}, {153, 18}}</string> - <reference key="NSSuperview" ref="757061322"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="485844511"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="601824583"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Change XA Speed</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="759409224"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <object class="NSButtonImageSource" key="NSAlternateImage" id="665587898"> - <string key="NSImageName">NSSwitch</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </array> - <string key="NSFrame">{{2, 2}, {189, 96}}</string> - <reference key="NSSuperview" ref="773092047"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="759409224"/> - </object> - </array> - <string key="NSFrame">{{256, 56}, {193, 113}}</string> - <reference key="NSSuperview" ref="335490069"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="757061322"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">XA Music</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="597649983"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="757061322"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSBox" id="759155340"> - <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSView" id="945237963"> - <reference key="NSNextResponder" ref="759155340"/> - <int key="NSvFlags">274</int> - <array class="NSMutableArray" key="NSSubviews"> - <object class="NSButton" id="570869394"> - <reference key="NSNextResponder" ref="945237963"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 58}, {199, 18}}</string> - <reference key="NSSuperview" ref="945237963"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="33989673"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="530057379"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">High Compatibility Mode</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="570869394"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="179046743"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> - <reference key="NSAlternateImage" ref="665587898"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="33989673"> - <reference key="NSNextResponder" ref="945237963"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 38}, {199, 18}}</string> - <reference key="NSSuperview" ref="945237963"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="882835815"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="409625895"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">SPU IRQ Wait</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="33989673"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="179046743"/> - <reference key="NSAlternateImage" ref="665587898"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="882835815"> - <reference key="NSNextResponder" ref="945237963"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{18, 16}, {199, 18}}</string> - <reference key="NSSuperview" ref="945237963"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="773092047"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="125730743"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Mono Sound</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="882835815"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSAlternateImage" ref="665587898"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </array> - <string key="NSFrame">{{2, 2}, {224, 96}}</string> - <reference key="NSSuperview" ref="759155340"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="570869394"/> - </object> - </array> - <string key="NSFrame">{{17, 56}, {228, 113}}</string> - <reference key="NSSuperview" ref="335490069"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="945237963"/> - <string key="NSOffsets">{0, 0}</string> - <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Misc</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSBackgroundColor" ref="597649983"/> - <object class="NSColor" key="NSTextColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MCAwLjgwMDAwMDAxAA</bytes> - </object> - </object> - <reference key="NSContentView" ref="945237963"/> - <int key="NSBorderType">3</int> - <int key="NSBoxType">0</int> - <int key="NSTitlePosition">2</int> - <bool key="NSTransparent">NO</bool> - </object> - <object class="NSButton" id="422793261"> - <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{330, 12}, {122, 32}}</string> - <reference key="NSSuperview" ref="335490069"/> - <reference key="NSWindow"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="28806191"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">OK</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="422793261"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="535632823"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="1066134528"> - <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{208, 12}, {122, 32}}</string> - <reference key="NSSuperview" ref="335490069"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="422793261"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="1004748773"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Cancel</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="1066134528"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="535632823"/> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">Gw</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="485844511"> - <reference key="NSNextResponder" ref="335490069"/> - <int key="NSvFlags">256</int> - <string key="NSFrame">{{14, 12}, {122, 32}}</string> - <reference key="NSSuperview" ref="335490069"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="1066134528"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="974258099"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134217728</int> - <string key="NSContents">Reset</string> - <reference key="NSSupport" ref="535632823"/> - <reference key="NSControlView" ref="485844511"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">1</int> - <reference key="NSAlternateImage" ref="535632823"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </array> - <string key="NSFrameSize">{466, 337}</string> - <reference key="NSSuperview"/> - <reference key="NSWindow"/> - <reference key="NSNextKeyView" ref="988321145"/> - </object> - <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> - <string key="NSMinSize">{213, 129}</string> - <string key="NSMaxSize">{10000000000000, 10000000000000}</string> - <bool key="NSWindowIsRestorable">YES</bool> - </object> - </array> - <object class="IBObjectContainer" key="IBDocument.Objects"> - <array class="NSMutableArray" key="connectionRecords"> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">window</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="980713848"/> - </object> - <int key="connectionID">39</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">ok:</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="422793261"/> - </object> - <int key="connectionID">60</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">cancel:</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="1066134528"/> - </object> - <int key="connectionID">61</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">reset:</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="485844511"/> - </object> - <int key="connectionID">63</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">reverbValue</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="1507912"/> - </object> - <int key="connectionID">58</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">interpolValue</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="398137737"/> - </object> - <int key="connectionID">55</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">volumeValue</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="1011324224"/> - </object> - <int key="connectionID">75</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">xaSpeedBox</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="759409224"/> - </object> - <int key="connectionID">66</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">hiCompBox</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="570869394"/> - </object> - <int key="connectionID">54</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">irqWaitBox</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="33989673"/> - </object> - <int key="connectionID">56</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">monoSoundBox</string> - <reference key="source" ref="758282330"/> - <reference key="destination" ref="882835815"/> - </object> - <int key="connectionID">57</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="980713848"/> - <reference key="destination" ref="758282330"/> - </object> - <int key="connectionID">43</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">initialFirstResponder</string> - <reference key="source" ref="980713848"/> - <reference key="destination" ref="1507912"/> - </object> - <int key="connectionID">53</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="1507912"/> - <reference key="destination" ref="398137737"/> - </object> - <int key="connectionID">44</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="398137737"/> - <reference key="destination" ref="570869394"/> - </object> - <int key="connectionID">45</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">takeStringValueFrom:</string> - <reference key="source" ref="184943800"/> - <reference key="destination" ref="1507912"/> - </object> - <int key="connectionID">41</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">takeStringValueFrom:</string> - <reference key="source" ref="261829518"/> - <reference key="destination" ref="398137737"/> - </object> - <int key="connectionID">42</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="759409224"/> - <reference key="destination" ref="422793261"/> - </object> - <int key="connectionID">50</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="33989673"/> - <reference key="destination" ref="882835815"/> - </object> - <int key="connectionID">47</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="422793261"/> - <reference key="destination" ref="1066134528"/> - </object> - <int key="connectionID">51</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="1066134528"/> - <reference key="destination" ref="1507912"/> - </object> - <int key="connectionID">52</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">nextKeyView</string> - <reference key="source" ref="1011324224"/> - <reference key="destination" ref="398137737"/> - </object> - <int key="connectionID">76</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">takeStringValueFrom:</string> - <reference key="source" ref="387662915"/> - <reference key="destination" ref="1011324224"/> - </object> - <int key="connectionID">78</int> - </object> - </array> - <object class="IBMutableOrderedSet" key="objectRecords"> - <array key="orderedObjects"> - <object class="IBObjectRecord"> - <int key="objectID">0</int> - <array key="object" id="0"/> - <reference key="children" ref="1003241861"/> - <nil key="parent"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-2</int> - <reference key="object" ref="758282330"/> - <reference key="parent" ref="0"/> - <string key="objectName">File's Owner</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-1</int> - <reference key="object" ref="438626275"/> - <reference key="parent" ref="0"/> - <string key="objectName">First Responder</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">6</int> - <reference key="object" ref="980713848"/> - <array class="NSMutableArray" key="children"> - <reference ref="335490069"/> - </array> - <reference key="parent" ref="0"/> - <string key="objectName">Configuration</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">5</int> - <reference key="object" ref="335490069"/> - <array class="NSMutableArray" key="children"> - <reference ref="988321145"/> - <reference ref="773092047"/> - <reference ref="759155340"/> - <reference ref="422793261"/> - <reference ref="1066134528"/> - <reference ref="485844511"/> - </array> - <reference key="parent" ref="980713848"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">9</int> - <reference key="object" ref="988321145"/> - <array class="NSMutableArray" key="children"> - <reference ref="121836166"/> - <reference ref="1507912"/> - <reference ref="197077555"/> - <reference ref="398137737"/> - <reference ref="184943800"/> - <reference ref="261829518"/> - <reference ref="74783790"/> - <reference ref="1011324224"/> - <reference ref="387662915"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">19</int> - <reference key="object" ref="773092047"/> - <array class="NSMutableArray" key="children"> - <reference ref="759409224"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">24</int> - <reference key="object" ref="759155340"/> - <array class="NSMutableArray" key="children"> - <reference ref="570869394"/> - <reference ref="33989673"/> - <reference ref="882835815"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">37</int> - <reference key="object" ref="422793261"/> - <array class="NSMutableArray" key="children"> - <reference ref="28806191"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">38</int> - <reference key="object" ref="1066134528"/> - <array class="NSMutableArray" key="children"> - <reference ref="1004748773"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">62</int> - <reference key="object" ref="485844511"/> - <array class="NSMutableArray" key="children"> - <reference ref="974258099"/> - </array> - <reference key="parent" ref="335490069"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">93</int> - <reference key="object" ref="28806191"/> - <reference key="parent" ref="422793261"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">94</int> - <reference key="object" ref="1004748773"/> - <reference key="parent" ref="1066134528"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">95</int> - <reference key="object" ref="974258099"/> - <reference key="parent" ref="485844511"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">-3</int> - <reference key="object" ref="225882746"/> - <reference key="parent" ref="0"/> - <string key="objectName">Application</string> - </object> - <object class="IBObjectRecord"> - <int key="objectID">11</int> - <reference key="object" ref="121836166"/> - <array class="NSMutableArray" key="children"> - <reference ref="429556832"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">80</int> - <reference key="object" ref="429556832"/> - <reference key="parent" ref="121836166"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">12</int> - <reference key="object" ref="1507912"/> - <array class="NSMutableArray" key="children"> - <reference ref="724216678"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">81</int> - <reference key="object" ref="724216678"/> - <reference key="parent" ref="1507912"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">15</int> - <reference key="object" ref="197077555"/> - <array class="NSMutableArray" key="children"> - <reference ref="74472058"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">82</int> - <reference key="object" ref="74472058"/> - <reference key="parent" ref="197077555"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">16</int> - <reference key="object" ref="398137737"/> - <array class="NSMutableArray" key="children"> - <reference ref="827693569"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">83</int> - <reference key="object" ref="827693569"/> - <reference key="parent" ref="398137737"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">17</int> - <reference key="object" ref="184943800"/> - <array class="NSMutableArray" key="children"> - <reference ref="909159478"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">84</int> - <reference key="object" ref="909159478"/> - <reference key="parent" ref="184943800"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">18</int> - <reference key="object" ref="261829518"/> - <array class="NSMutableArray" key="children"> - <reference ref="336300577"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">85</int> - <reference key="object" ref="336300577"/> - <reference key="parent" ref="261829518"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">69</int> - <reference key="object" ref="74783790"/> - <array class="NSMutableArray" key="children"> - <reference ref="902474361"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">86</int> - <reference key="object" ref="902474361"/> - <reference key="parent" ref="74783790"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">70</int> - <reference key="object" ref="1011324224"/> - <array class="NSMutableArray" key="children"> - <reference ref="846739879"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">87</int> - <reference key="object" ref="846739879"/> - <reference key="parent" ref="1011324224"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">71</int> - <reference key="object" ref="387662915"/> - <array class="NSMutableArray" key="children"> - <reference ref="723960494"/> - </array> - <reference key="parent" ref="988321145"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">88</int> - <reference key="object" ref="723960494"/> - <reference key="parent" ref="387662915"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">22</int> - <reference key="object" ref="759409224"/> - <array class="NSMutableArray" key="children"> - <reference ref="601824583"/> - </array> - <reference key="parent" ref="773092047"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">89</int> - <reference key="object" ref="601824583"/> - <reference key="parent" ref="759409224"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">25</int> - <reference key="object" ref="570869394"/> - <array class="NSMutableArray" key="children"> - <reference ref="530057379"/> - </array> - <reference key="parent" ref="759155340"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">90</int> - <reference key="object" ref="530057379"/> - <reference key="parent" ref="570869394"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">26</int> - <reference key="object" ref="33989673"/> - <array class="NSMutableArray" key="children"> - <reference ref="409625895"/> - </array> - <reference key="parent" ref="759155340"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">91</int> - <reference key="object" ref="409625895"/> - <reference key="parent" ref="33989673"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">33</int> - <reference key="object" ref="882835815"/> - <array class="NSMutableArray" key="children"> - <reference ref="125730743"/> - </array> - <reference key="parent" ref="759155340"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">92</int> - <reference key="object" ref="125730743"/> - <reference key="parent" ref="882835815"/> - </object> - </array> - </object> - <dictionary class="NSMutableDictionary" key="flattenedProperties"> - <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="12.CustomClassName">NetSfPeopsSPUALPluginNamedSlider</string> - <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="16.CustomClassName">NetSfPeopsSPUALPluginNamedSlider</string> - <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary" key="25.IBAttributePlaceholdersKey"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="570869394"/> - <string key="toolTip">Should always be enabled. Only disable this option if the emulator doesn't support the SPUupdate/async plugin interface.</string> - </object> - </object> - <string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary" key="26.IBAttributePlaceholdersKey"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="33989673"/> - <string key="toolTip">When enabled the plugin will waits for CPU action which a few games requires (Metal Gears Solid + others)</string> - </object> - </object> - <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="70.CustomClassName">NetSfPeopsSPUALPluginNamedSlider</string> - <string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="82.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="84.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="87.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="88.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="89.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="90.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="91.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="92.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="93.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="94.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="95.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - </dictionary> - <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> - <nil key="activeLocalization"/> - <dictionary class="NSMutableDictionary" key="localizations"/> - <nil key="sourceID"/> - <int key="maxID">95</int> - </object> - <object class="IBClassDescriber" key="IBDocument.Classes"> - <array class="NSMutableArray" key="referencedPartialClassDescriptions"> - <object class="IBPartialClassDescription"> - <string key="className">NetSfPeopsSPUALPluginController</string> - <string key="superclassName">NSWindowController</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NetSfPeopsSPUALPluginController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NetSfPeopsSPUALPluginNamedSlider</string> - <string key="superclassName">NSSlider</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NetSfPeopsSPUALPluginNamedSlider.h</string> - </object> - </object> - </array> - </object> - <int key="IBDocument.localizationMode">0</int> - <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <real value="1060" key="NS.object.0"/> - </object> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <real value="1060" key="NS.object.0"/> - </object> - <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> - <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <string key="NS.key.0">NSSwitch</string> - <string key="NS.object.0">{15, 15}</string> - </object> - </data> -</archive> diff --git a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/Credits.rtf b/macosx/plugins/DFSound/Resorces/SDL/English.lproj/Credits.rtf deleted file mode 100644 index 3847a9c0..00000000 --- a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/Credits.rtf +++ /dev/null @@ -1,13 +0,0 @@ -{\rtf1\mac\ansicpg10025\cocoartf824\cocoasubrtf240 -{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;} -{\colortbl;\red255\green255\blue255;} -\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural - -\f0\b\fs24 \cf0 Macintosh Port: -\f1\b0 \ - Gil Pedersen\ -\ - -\f0\b Original coders: -\f1\b0 \ - Pete Bernert and the P.E.Op.S. team}
\ No newline at end of file diff --git a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/Localizable.strings b/macosx/plugins/DFSound/Resorces/SDL/English.lproj/Localizable.strings deleted file mode 100644 index cc95ea1d..00000000 --- a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/Localizable.strings +++ /dev/null @@ -1,30 +0,0 @@ -/* - Localizable.strings - PeopsSPU - - Created by C.W. Betts on 11/16/11. - Copyright 2011 __MyCompanyName__. All rights reserved. - */ - -"SDL Sound" = "SDL Sound"; -"OpenAL Sound" = "OpenAL Sound"; -"Mac OS X Sound" = "Mac OS X Sound"; -"P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n" = "P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n"; - -/* Interpolation Values */ -"(No Interpolation)" = "(No Interpolation)"; -"(Simple Interpolation)" = "(Simple Interpolation)"; -"(Gaussian Interpolation)" = "(Gaussian Interpolation)"; -"(Cubic Interpolation)" = "(Cubic Interpolation)"; - -/* Reverb Values */ -"(No Reverb)" = "(No Reverb)"; -"(Simple Reverb)" = "(Simple Reverb)"; -"(PSX Reverb)" = "(PSX Reverb)"; - -/* Volume Values */ -"(Muted)" = "(Muted)"; -"(Low)" = "(Low)"; -"(Medium)" = "(Medium)"; -"(Loud)" = "(Loud)"; -"(Loudest)" = "(Loudest)"; diff --git a/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Credits.rtf b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf index 3847a9c0..3847a9c0 100644 --- a/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Credits.rtf +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf diff --git a/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Localizable.strings b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Localizable.strings index cc95ea1d..9c4b6b4f 100644 --- a/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Localizable.strings +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Localizable.strings @@ -11,6 +11,9 @@ "Mac OS X Sound" = "Mac OS X Sound"; "P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n" = "P.E.Op.S. Sound Driver V1.7\nCoded by Pete Bernert and the P.E.Op.S. team\n"; +/*Unknown/not found value */ +"(Unknown)" = "(Unknown)"; + /* Interpolation Values */ "(No Interpolation)" = "(No Interpolation)"; "(Simple Interpolation)" = "(Simple Interpolation)"; diff --git a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/NetSfPeopsSpuSDLPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib index 74a1170d..86afd475 100644 --- a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/NetSfPeopsSpuSDLPluginMain.xib +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib @@ -2,25 +2,25 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> <int key="IBDocument.SystemTarget">1060</int> - <string key="IBDocument.SystemVersion">11C74</string> - <string key="IBDocument.InterfaceBuilderVersion">1938</string> - <string key="IBDocument.AppKitVersion">1138.23</string> - <string key="IBDocument.HIToolboxVersion">567.00</string> + <string key="IBDocument.SystemVersion">12E55</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> + <string key="IBDocument.AppKitVersion">1187.39</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">1938</string> + <string key="NS.object.0">3084</string> </object> <array key="IBDocument.IntegratedClassDependencies"> - <string>NSView</string> + <string>NSBox</string> + <string>NSButton</string> + <string>NSButtonCell</string> <string>NSCustomObject</string> - <string>NSWindowTemplate</string> + <string>NSSlider</string> + <string>NSSliderCell</string> <string>NSTextField</string> <string>NSTextFieldCell</string> - <string>NSSliderCell</string> - <string>NSSlider</string> - <string>NSButtonCell</string> - <string>NSButton</string> - <string>NSBox</string> + <string>NSView</string> + <string>NSWindowTemplate</string> </array> <array key="IBDocument.PluginDependencies"> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -31,7 +31,7 @@ </object> <array class="NSMutableArray" key="IBDocument.RootObjects" id="1003241861"> <object class="NSCustomObject" id="758282330"> - <string key="NSClassName">NetSfPeopsSPUSDLPluginController</string> + <string key="NSClassName">SPUPluginController</string> </object> <object class="NSCustomObject" id="438626275"> <string key="NSClassName">FirstResponder</string> @@ -72,7 +72,7 @@ <reference key="NSNextKeyView" ref="1507912"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="429556832"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">4194304</int> <string key="NSContents">Reverb:</string> <object class="NSFont" key="NSSupport" id="535632823"> @@ -100,6 +100,7 @@ </object> </object> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSSlider" id="1507912"> <reference key="NSNextResponder" ref="517400347"/> @@ -110,7 +111,7 @@ <reference key="NSNextKeyView" ref="184943800"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="724216678"> - <int key="NSCellFlags">67501824</int> + <int key="NSCellFlags">67371264</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -130,6 +131,7 @@ <bool key="NSAllowsTickMarkValuesOnly">YES</bool> <bool key="NSVertical">NO</bool> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="197077555"> <reference key="NSNextResponder" ref="517400347"/> @@ -140,7 +142,7 @@ <reference key="NSNextKeyView" ref="398137737"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="74472058"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">4194304</int> <string key="NSContents">Interpolation:</string> <reference key="NSSupport" ref="535632823"/> @@ -148,6 +150,7 @@ <reference key="NSBackgroundColor" ref="498551882"/> <reference key="NSTextColor" ref="823702402"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSSlider" id="398137737"> <reference key="NSNextResponder" ref="517400347"/> @@ -158,7 +161,7 @@ <reference key="NSNextKeyView" ref="261829518"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="827693569"> - <int key="NSCellFlags">67501824</int> + <int key="NSCellFlags">67371264</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -174,6 +177,7 @@ <bool key="NSAllowsTickMarkValuesOnly">YES</bool> <bool key="NSVertical">NO</bool> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="184943800"> <reference key="NSNextResponder" ref="517400347"/> @@ -184,7 +188,7 @@ <reference key="NSNextKeyView" ref="197077555"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="909159478"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">71303168</int> <string key="NSContents">(Simple Reverb)</string> <object class="NSFont" key="NSSupport" id="26"> @@ -196,6 +200,7 @@ <reference key="NSBackgroundColor" ref="498551882"/> <reference key="NSTextColor" ref="823702402"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="261829518"> <reference key="NSNextResponder" ref="517400347"/> @@ -206,7 +211,7 @@ <reference key="NSNextKeyView" ref="74783790"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="336300577"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">71303168</int> <string key="NSContents">(Simple Interpolation)</string> <reference key="NSSupport" ref="26"/> @@ -214,6 +219,7 @@ <reference key="NSBackgroundColor" ref="498551882"/> <reference key="NSTextColor" ref="823702402"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="74783790"> <reference key="NSNextResponder" ref="517400347"/> @@ -224,7 +230,7 @@ <reference key="NSNextKeyView" ref="1011324224"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="902474361"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">4194304</int> <string key="NSContents">Volume:</string> <reference key="NSSupport" ref="535632823"/> @@ -232,6 +238,7 @@ <reference key="NSBackgroundColor" ref="498551882"/> <reference key="NSTextColor" ref="823702402"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSSlider" id="1011324224"> <reference key="NSNextResponder" ref="517400347"/> @@ -242,7 +249,7 @@ <reference key="NSNextKeyView" ref="387662915"/> <bool key="NSEnabled">YES</bool> <object class="NSSliderCell" key="NSCell" id="846739879"> - <int key="NSCellFlags">67501824</int> + <int key="NSCellFlags">67371264</int> <int key="NSCellFlags2">0</int> <object class="NSMutableString" key="NSContents"> <characters key="NS.bytes"/> @@ -258,6 +265,7 @@ <bool key="NSAllowsTickMarkValuesOnly">YES</bool> <bool key="NSVertical">NO</bool> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSTextField" id="387662915"> <reference key="NSNextResponder" ref="517400347"/> @@ -268,7 +276,7 @@ <reference key="NSNextKeyView" ref="759155340"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="723960494"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">71303168</int> <string key="NSContents">(Loud)</string> <reference key="NSSupport" ref="26"/> @@ -276,6 +284,7 @@ <reference key="NSBackgroundColor" ref="498551882"/> <reference key="NSTextColor" ref="823702402"/> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </array> <string key="NSFrame">{{2, 2}, {428, 127}}</string> @@ -290,7 +299,7 @@ <reference key="NSNextKeyView" ref="517400347"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">General Settings</string> <reference key="NSSupport" ref="26"/> @@ -331,12 +340,12 @@ <reference key="NSNextKeyView" ref="485844511"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="601824583"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Change XA Speed</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="759409224"/> - <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <object class="NSButtonImageSource" key="NSAlternateImage" id="665587898"> <string key="NSImageName">NSSwitch</string> @@ -346,6 +355,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </array> <string key="NSFrame">{{2, 2}, {189, 96}}</string> @@ -360,7 +370,7 @@ <reference key="NSNextKeyView" ref="757061322"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">XA Music</string> <reference key="NSSupport" ref="26"/> @@ -393,12 +403,12 @@ <reference key="NSNextKeyView" ref="33989673"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="530057379"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">High Compatibility Mode</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="570869394"/> - <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <object class="NSCustomResource" key="NSNormalImage" id="179046743"> <string key="NSClassName">NSImage</string> @@ -410,6 +420,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSButton" id="33989673"> <reference key="NSNextResponder" ref="945237963"/> @@ -420,12 +431,12 @@ <reference key="NSNextKeyView" ref="882835815"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="409625895"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">SPU IRQ Wait</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="33989673"/> - <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <reference key="NSNormalImage" ref="179046743"/> <reference key="NSAlternateImage" ref="665587898"/> @@ -434,6 +445,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSButton" id="882835815"> <reference key="NSNextResponder" ref="945237963"/> @@ -444,12 +456,12 @@ <reference key="NSNextKeyView" ref="773092047"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="125730743"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Mono Sound</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="882835815"/> - <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags">1211912448</int> <int key="NSButtonFlags2">2</int> <reference key="NSAlternateImage" ref="665587898"/> <string key="NSAlternateContents"/> @@ -457,6 +469,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </array> <string key="NSFrame">{{2, 2}, {224, 96}}</string> @@ -471,7 +484,7 @@ <reference key="NSNextKeyView" ref="945237963"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Misc</string> <reference key="NSSupport" ref="26"/> @@ -493,14 +506,15 @@ <string key="NSFrame">{{330, 12}, {122, 32}}</string> <reference key="NSSuperview" ref="335490069"/> <reference key="NSWindow"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="28806191"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">OK</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="422793261"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">1</int> <reference key="NSAlternateImage" ref="535632823"/> <string key="NSAlternateContents"/> @@ -508,6 +522,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSButton" id="1066134528"> <reference key="NSNextResponder" ref="335490069"/> @@ -518,12 +533,12 @@ <reference key="NSNextKeyView" ref="422793261"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1004748773"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Cancel</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="1066134528"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">1</int> <reference key="NSAlternateImage" ref="535632823"/> <string key="NSAlternateContents"/> @@ -531,6 +546,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> <object class="NSButton" id="485844511"> <reference key="NSNextResponder" ref="335490069"/> @@ -541,12 +557,12 @@ <reference key="NSNextKeyView" ref="1066134528"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="974258099"> - <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags">67108864</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Reset</string> <reference key="NSSupport" ref="535632823"/> <reference key="NSControlView" ref="485844511"/> - <int key="NSButtonFlags">-2038284033</int> + <int key="NSButtonFlags">-2038284288</int> <int key="NSButtonFlags2">1</int> <reference key="NSAlternateImage" ref="535632823"/> <string key="NSAlternateContents"/> @@ -554,6 +570,7 @@ <int key="NSPeriodicDelay">200</int> <int key="NSPeriodicInterval">25</int> </object> + <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> </array> <string key="NSFrameSize">{466, 337}</string> @@ -561,7 +578,7 @@ <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="988321145"/> </object> - <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> + <string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> <string key="NSMinSize">{213, 129}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -1051,10 +1068,10 @@ <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="12.CustomClassName">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="12.CustomClassName">NamedSlider</string> <string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="16.CustomClassName">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="16.CustomClassName">NamedSlider</string> <string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1086,7 +1103,7 @@ <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="70.CustomClassName">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="70.CustomClassName">NamedSlider</string> <string key="70.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="71.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1116,15 +1133,42 @@ <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="IBPartialClassDescription"> - <string key="className">NetSfPeopsSPUSDLPluginController</string> + <string key="className">NamedSlider</string> + <string key="superclassName">NSSlider</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">./Classes/NamedSlider.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> + <string key="className">SPUPluginController</string> <string key="superclassName">NSWindowController</string> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="cancel:">id</string> + <string key="ok:">id</string> + <string key="reset:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="cancel:"> + <string key="name">cancel:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="ok:"> + <string key="name">ok:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="reset:"> + <string key="name">reset:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> <dictionary class="NSMutableDictionary" key="outlets"> <string key="hiCompBox">NSControl</string> - <string key="interpolValue">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="interpolValue">NamedSlider</string> <string key="irqWaitBox">NSControl</string> <string key="monoSoundBox">NSControl</string> - <string key="reverbValue">NetSfPeopsSPUSDLPluginNamedSlider</string> - <string key="volumeValue">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="reverbValue">NamedSlider</string> + <string key="volumeValue">NamedSlider</string> <string key="xaEnableBox">NSControl</string> <string key="xaSpeedBox">NSControl</string> </dictionary> @@ -1135,7 +1179,7 @@ </object> <object class="IBToOneOutletInfo" key="interpolValue"> <string key="name">interpolValue</string> - <string key="candidateClassName">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="candidateClassName">NamedSlider</string> </object> <object class="IBToOneOutletInfo" key="irqWaitBox"> <string key="name">irqWaitBox</string> @@ -1147,11 +1191,11 @@ </object> <object class="IBToOneOutletInfo" key="reverbValue"> <string key="name">reverbValue</string> - <string key="candidateClassName">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="candidateClassName">NamedSlider</string> </object> <object class="IBToOneOutletInfo" key="volumeValue"> <string key="name">volumeValue</string> - <string key="candidateClassName">NetSfPeopsSPUSDLPluginNamedSlider</string> + <string key="candidateClassName">NamedSlider</string> </object> <object class="IBToOneOutletInfo" key="xaEnableBox"> <string key="name">xaEnableBox</string> @@ -1164,15 +1208,7 @@ </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NetSfPeopsSPUSDLPluginController.h</string> - </object> - </object> - <object class="IBPartialClassDescription"> - <string key="className">NetSfPeopsSPUSDLPluginNamedSlider</string> - <string key="superclassName">NSSlider</string> - <object class="IBClassDescriptionSource" key="sourceIdentifier"> - <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/NetSfPeopsSPUSDLPluginNamedSlider.h</string> + <string key="minorKey">./Classes/SPUPluginController.h</string> </object> </object> </array> @@ -1183,10 +1219,6 @@ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <real value="1060" key="NS.object.0"/> </object> - <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> - <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> - <real value="1060" key="NS.object.0"/> - </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.h b/macosx/plugins/DFSound/macsrc/NamedSlider.h index 38c38f9e..790db09a 100755 --- a/macosx/plugins/DFSound/macsrc/NamedSlider.h +++ b/macosx/plugins/DFSound/macsrc/NamedSlider.h @@ -2,16 +2,11 @@ #import <Cocoa/Cocoa.h> -#ifdef USEOPENAL -#define NamedSlider NetSfPeopsSPUALPluginNamedSlider -#else -#define NamedSlider NetSfPeopsSPUSDLPluginNamedSlider -#endif - @interface NamedSlider : NSSlider { NSArray *strings; + Class pluginClass; } - -- (void)setStrings:(NSArray *)theStrings; +@property (retain) NSArray *strings; +@property Class pluginClass; @end diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.m b/macosx/plugins/DFSound/macsrc/NamedSlider.m index 2db2f25e..750d0376 100755 --- a/macosx/plugins/DFSound/macsrc/NamedSlider.m +++ b/macosx/plugins/DFSound/macsrc/NamedSlider.m @@ -1,19 +1,16 @@ #import "NamedSlider.h" @implementation NamedSlider +@synthesize pluginClass; - (void)dealloc { - [strings release]; + self.strings = nil; + [super dealloc]; } -- (void)setStrings:(NSArray *)theStrings -{ - [theStrings retain]; - [strings release]; - strings = theStrings; -} +@synthesize strings; - (NSString *)stringValue { @@ -22,7 +19,11 @@ if (index >= 0 && index < [strings count]) return [strings objectAtIndex:index]; - return @"(Unknown)"; + if (!pluginClass) { + return @"(Unknown)"; + } else { + return [[NSBundle bundleForClass:pluginClass] localizedStringForKey:@"(Unknown)" value:@"" table:nil]; + } } - (void)setIntValue:(int)value diff --git a/macosx/plugins/DFSound/macsrc/PluginController.h b/macosx/plugins/DFSound/macsrc/PluginController.h index 10f2752c..38331f74 100755 --- a/macosx/plugins/DFSound/macsrc/PluginController.h +++ b/macosx/plugins/DFSound/macsrc/PluginController.h @@ -1,7 +1,7 @@ /* NetSfPeopsSPUPluginController */ #import <Cocoa/Cocoa.h> -#import "NamedSlider.h" +#import "SPUPluginController.h" #ifdef USEOPENAL #define PluginController NetSfPeopsSPUALPluginController @@ -9,22 +9,5 @@ #define PluginController NetSfPeopsSPUSDLPluginController #endif -@interface PluginController : NSWindowController -{ - IBOutlet NSControl *hiCompBox; - IBOutlet NamedSlider *interpolValue; - IBOutlet NSControl *irqWaitBox; - IBOutlet NSControl *monoSoundBox; - IBOutlet NamedSlider *reverbValue; - IBOutlet NSControl *xaEnableBox; - IBOutlet NSControl *xaSpeedBox; - IBOutlet NamedSlider *volumeValue; - - NSMutableDictionary *keyValues; -} -- (IBAction)cancel:(id)sender; -- (IBAction)ok:(id)sender; -- (IBAction)reset:(id)sender; - -- (void)loadValues; +@interface PluginController : SPUPluginController @end diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m index c074ce72..655f479e 100755 --- a/macosx/plugins/DFSound/macsrc/PluginController.m +++ b/macosx/plugins/DFSound/macsrc/PluginController.m @@ -41,7 +41,7 @@ extern char* PLUGLOC(char* toloc); #endif #define PrefsKey APP_ID @" Settings" -static PluginController *pluginController = nil; +static SPUPluginController *pluginController = nil; char * pConfigFile=NULL; void DoAbout() @@ -80,11 +80,7 @@ long DoConfiguration() NSWindow *window; if (pluginController == nil) { -#ifdef USEOPENAL - pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuALPluginMain"]; -#else - pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuSDLPluginMain"]; -#endif + pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"]; } window = [pluginController window]; @@ -103,13 +99,13 @@ void ReadConfig(void) NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; [defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys: [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithBool:YES], @"High Compatibility Mode", - [NSNumber numberWithBool:YES], @"SPU IRQ Wait", - [NSNumber numberWithBool:NO], @"XA Pitch", - [NSNumber numberWithBool:NO], @"Mono Sound Output", - [NSNumber numberWithInt:0], @"Interpolation Quality", - [NSNumber numberWithInt:1], @"Reverb Quality", - [NSNumber numberWithInt:3], @"Volume", + @YES, @"High Compatibility Mode", + @YES, @"SPU IRQ Wait", + @NO, @"XA Pitch", + @NO, @"Mono Sound Output", + @0, @"Interpolation Quality", + @1, @"Reverb Quality", + @3, @"Volume", nil], PrefsKey, nil]]; @@ -138,15 +134,15 @@ void ReadConfig(void) NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues]; - [writeDic setObject:[NSNumber numberWithBool:[hiCompBox intValue]] forKey:@"High Compatibility Mode"]; - [writeDic setObject:[NSNumber numberWithBool:[irqWaitBox intValue]] forKey:@"SPU IRQ Wait"]; - [writeDic setObject:[NSNumber numberWithBool:[monoSoundBox intValue]] forKey:@"Mono Sound Output"]; - [writeDic setObject:[NSNumber numberWithBool:[xaSpeedBox intValue]] forKey:@"XA Pitch"]; + [writeDic setObject:@((BOOL)[hiCompBox intValue]) forKey:@"High Compatibility Mode"]; + [writeDic setObject:@((BOOL)[irqWaitBox intValue]) forKey:@"SPU IRQ Wait"]; + [writeDic setObject:@((BOOL)[monoSoundBox intValue]) forKey:@"Mono Sound Output"]; + [writeDic setObject:@((BOOL)[xaSpeedBox intValue]) forKey:@"XA Pitch"]; - [writeDic setObject:[NSNumber numberWithInt:[interpolValue intValue]] forKey:@"Interpolation Quality"]; - [writeDic setObject:[NSNumber numberWithInt:[reverbValue intValue]] forKey:@"Reverb Quality"]; + [writeDic setObject:@([interpolValue intValue]) forKey:@"Interpolation Quality"]; + [writeDic setObject:@([reverbValue intValue]) forKey:@"Reverb Quality"]; - [writeDic setObject:[NSNumber numberWithInt:[volumeValue intValue]] forKey:@"Volume"]; + [writeDic setObject:@([volumeValue intValue]) forKey:@"Volume"]; // write to defaults [defaults setObject:writeDic forKey:PrefsKey]; @@ -187,37 +183,40 @@ void ReadConfig(void) - (void)awakeFromNib { - NSBundle *mainBundle = [NSBundle bundleForClass:[self class]]; - - [interpolValue setStrings:[NSArray arrayWithObjects: - [mainBundle localizedStringForKey:@"(No Interpolation)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Simple Interpolation)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Gaussian Interpolation)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Cubic Interpolation)" value:nil table:nil], - nil]]; - - [reverbValue setStrings:[NSArray arrayWithObjects: - [mainBundle localizedStringForKey:@"(No Reverb)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Simple Reverb)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(PSX Reverb)" value:nil table:nil], - nil]]; - - [volumeValue setStrings:[NSArray arrayWithObjects: - [mainBundle localizedStringForKey:@"(Muted)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Low)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Medium)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Loud)" value:nil table:nil], - [mainBundle localizedStringForKey:@"(Loudest)" value:nil table:nil], - nil]]; + Class thisClass = [self class]; + + NSBundle *mainBundle = [NSBundle bundleForClass:thisClass]; + + [interpolValue setStrings:@[ + [mainBundle localizedStringForKey:@"(No Interpolation)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Simple Interpolation)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Gaussian Interpolation)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Cubic Interpolation)" value:@"" table:nil]]]; + interpolValue.pluginClass = thisClass; + + [reverbValue setStrings:@[ + [mainBundle localizedStringForKey:@"(No Reverb)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Simple Reverb)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(PSX Reverb)" value:@"" table:nil]]]; + reverbValue.pluginClass = thisClass; + + [volumeValue setStrings:@[ + [mainBundle localizedStringForKey:@"(Muted)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Low)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Medium)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Loud)" value:@"" table:nil], + [mainBundle localizedStringForKey:@"(Loudest)" value:@"" table:nil]]]; + volumeValue.pluginClass = thisClass; } @end + char* PLUGLOC(char *toloc) { NSBundle *mainBundle = [NSBundle bundleForClass:[PluginController class]]; NSString *origString = nil, *transString = nil; - origString = [NSString stringWithCString:toloc encoding:NSUTF8StringEncoding]; - transString = [mainBundle localizedStringForKey:origString value:nil table:nil]; - return (char*)[transString cStringUsingEncoding:NSUTF8StringEncoding]; + origString = @(toloc); + transString = [mainBundle localizedStringForKey:origString value:@"" table:nil]; + return (char*)[transString UTF8String]; } diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.h b/macosx/plugins/DFSound/macsrc/SPUPluginController.h new file mode 100644 index 00000000..e6a61308 --- /dev/null +++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.h @@ -0,0 +1,30 @@ +// +// SPUPluginController.h +// PeopsSPU +// +// Created by C.W. Betts on 7/2/13. +// +// + +#import <Cocoa/Cocoa.h> +#import "NamedSlider.h" + +@interface SPUPluginController : NSWindowController +{ + IBOutlet NSControl *hiCompBox; + IBOutlet NamedSlider *interpolValue; + IBOutlet NSControl *irqWaitBox; + IBOutlet NSControl *monoSoundBox; + IBOutlet NamedSlider *reverbValue; + IBOutlet NSControl *xaEnableBox; + IBOutlet NSControl *xaSpeedBox; + IBOutlet NamedSlider *volumeValue; + + NSMutableDictionary *keyValues; +} +- (IBAction)cancel:(id)sender; +- (IBAction)ok:(id)sender; +- (IBAction)reset:(id)sender; + +- (void)loadValues; +@end diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m new file mode 100644 index 00000000..bfc11f01 --- /dev/null +++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m @@ -0,0 +1,57 @@ +// +// SPUPluginController.m +// PeopsSPU +// +// Created by C.W. Betts on 7/2/13. +// +// + +#import "SPUPluginController.h" + +@implementation SPUPluginController + +static inline void FuncNotAvailable(id sel, id sender, SEL theCmd) +{ +#ifdef DEBUG + NSLog(@"Class %@ does not implement %@, and was sent a(n) %@ with the description %@", [sel class], NSStringFromSelector(theCmd), [sender class], [sender description]); + if ([sel isMemberOfClass:[SPUPluginController class]]) { + NSLog(@"For one thing, the class %@ isn't supposed to be accessed directly, just subclassed!", [SPUPluginController class]); \ + } else { + NSLog(@"You should implement %@ for your class %@. As it is, you are calling %@ from the superclass %@.", NSStringFromSelector(theCmd), [sel class], NSStringFromSelector(theCmd), [SPUPluginController class]); + } +#endif + [sel doesNotRecognizeSelector:theCmd]; +} + +#define NotAvailableWarn() FuncNotAvailable(self, sender, _cmd) + +- (IBAction)cancel:(id)sender +{ + NotAvailableWarn(); + +} + +- (IBAction)ok:(id)sender +{ + NotAvailableWarn(); +} + +- (IBAction)reset:(id)sender +{ + NotAvailableWarn(); +} + +- (void)loadValues +{ +#ifdef DEBUG + NSLog(@"Class %@ does not implement %@", [self class], NSStringFromSelector(_cmd)); + if ([self isMemberOfClass:[SPUPluginController class]]) { + NSLog(@"For one thing, the class %@ isn't supposed to be accessed directly, just subclassed!", [SPUPluginController class]); + } else { + NSLog(@"You should implement %@ for your class %@. As it is, you are calling %@ from the superclass %@.", NSStringFromSelector(_cmd), [self class], NSStringFromSelector(_cmd), [SPUPluginController class]); + } +#endif + [self doesNotRecognizeSelector:_cmd]; +} + +@end |