From f557fb4d2b84e5948f54a5fbb0a645a5f97b83dd Mon Sep 17 00:00:00 2001 From: "SND\\MaddTheSane_cp" Date: Wed, 3 Jul 2013 06:57:46 +0000 Subject: 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 --- .../DFSound/PeopsSPU.xcodeproj/project.pbxproj | 317 +++-- .../Resorces/OpenAL/English.lproj/Credits.rtf | 13 - .../OpenAL/English.lproj/Localizable.strings | 30 - .../English.lproj/NetSfPeopsSpuALPluginMain.xib | 1153 ------------------ .../DFSound/Resorces/SDL/English.lproj/Credits.rtf | 13 - .../Resorces/SDL/English.lproj/Localizable.strings | 30 - .../English.lproj/NetSfPeopsSpuSDLPluginMain.xib | 1197 ------------------- .../Resorces/Shared/English.lproj/Credits.rtf | 13 + .../Shared/English.lproj/Localizable.strings | 33 + .../English.lproj/NetSfPeopsSpuPluginMain.xib | 1229 ++++++++++++++++++++ macosx/plugins/DFSound/macsrc/NamedSlider.h | 11 +- macosx/plugins/DFSound/macsrc/NamedSlider.m | 17 +- macosx/plugins/DFSound/macsrc/PluginController.h | 21 +- macosx/plugins/DFSound/macsrc/PluginController.m | 89 +- .../plugins/DFSound/macsrc/SPUPluginController.h | 30 + .../plugins/DFSound/macsrc/SPUPluginController.m | 57 + 16 files changed, 1670 insertions(+), 2583 deletions(-) delete mode 100644 macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Credits.rtf delete mode 100644 macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Localizable.strings delete mode 100644 macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/NetSfPeopsSpuALPluginMain.xib delete mode 100644 macosx/plugins/DFSound/Resorces/SDL/English.lproj/Credits.rtf delete mode 100644 macosx/plugins/DFSound/Resorces/SDL/English.lproj/Localizable.strings delete mode 100644 macosx/plugins/DFSound/Resorces/SDL/English.lproj/NetSfPeopsSpuSDLPluginMain.xib create mode 100644 macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf create mode 100644 macosx/plugins/DFSound/Resorces/Shared/English.lproj/Localizable.strings create mode 100644 macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib create mode 100644 macosx/plugins/DFSound/macsrc/SPUPluginController.h create mode 100644 macosx/plugins/DFSound/macsrc/SPUPluginController.m (limited to 'macosx/plugins/DFSound') 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 = ""; }; - 2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = ""; }; - 2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = ""; }; + 2B7B2B91072D9BE6007F0C35 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = PluginController.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; + 2B7B2B92072D9BE6007F0C35 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = PluginController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; 2B7B2BD0072DAE5D007F0C35 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NamedSlider.h; sourceTree = ""; }; 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = NamedSlider.m; sourceTree = ""; }; 2BFF7F3D0715D2E00061278A /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; - 5506635914AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; 5506635B14AB91C100C7C565 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 5506635D14AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; - 5506636214AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = ""; }; 5506636414AB91C100C7C565 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; - 5506636614AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; - 5506636814AB91C100C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuSDLPluginMain.xib; sourceTree = ""; }; - 5506639914AB9E0300C7C565 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuALPluginMain.xib; sourceTree = ""; }; 5517C065136217DE00706CCF /* externals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = externals.c; sourceTree = ""; }; + 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 = ""; }; + 5545886D1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = ""; }; + 5545886F1783E5FE008A7407 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSpuPluginMain.xib; sourceTree = ""; }; + 554588761783F2E3008A7407 /* SPUPluginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUPluginController.h; sourceTree = ""; }; + 554588771783F2E3008A7407 /* SPUPluginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUPluginController.m; sourceTree = ""; }; 5599692713AFCCC600B0216B /* openal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openal.c; sourceTree = ""; }; 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 = ""; @@ -266,6 +332,8 @@ 2B7B2B92072D9BE6007F0C35 /* PluginController.m */, 2B7B2BE6072DB1B6007F0C35 /* NamedSlider.h */, 2B7B2BE7072DB1B6007F0C35 /* NamedSlider.m */, + 554588761783F2E3008A7407 /* SPUPluginController.h */, + 554588771783F2E3008A7407 /* SPUPluginController.m */, ); path = macsrc; sourceTree = ""; @@ -273,10 +341,7 @@ 5506635714AB91C100C7C565 /* OpenAL */ = { isa = PBXGroup; children = ( - 5506635814AB91C100C7C565 /* Credits.rtf */, 5506635A14AB91C100C7C565 /* InfoPlist.strings */, - 5506635C14AB91C100C7C565 /* Localizable.strings */, - 5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */, ); path = OpenAL; sourceTree = ""; @@ -284,14 +349,40 @@ 5506636014AB91C100C7C565 /* SDL */ = { isa = PBXGroup; children = ( - 5506636114AB91C100C7C565 /* Credits.rtf */, 5506636314AB91C100C7C565 /* InfoPlist.strings */, - 5506636514AB91C100C7C565 /* Localizable.strings */, - 5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */, ); path = SDL; sourceTree = ""; }; + 554588441783DF39008A7407 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 554588451783DF39008A7407 /* Cocoa.framework */, + 554588471783DF39008A7407 /* Other Frameworks */, + ); + name = Frameworks; + sourceTree = ""; + }; + 554588471783DF39008A7407 /* Other Frameworks */ = { + isa = PBXGroup; + children = ( + 554588481783DF39008A7407 /* AppKit.framework */, + 554588491783DF39008A7407 /* CoreData.framework */, + 5545884A1783DF39008A7407 /* Foundation.framework */, + ); + name = "Other Frameworks"; + sourceTree = ""; + }; + 554588691783E5FE008A7407 /* Shared */ = { + isa = PBXGroup; + children = ( + 5545886A1783E5FE008A7407 /* Credits.rtf */, + 5545886C1783E5FE008A7407 /* Localizable.strings */, + 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */, + ); + path = Shared; + sourceTree = ""; + }; 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 = ""; - }; 5506635A14AB91C100C7C565 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -564,22 +701,6 @@ name = InfoPlist.strings; sourceTree = ""; }; - 5506635C14AB91C100C7C565 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - 5506635D14AB91C100C7C565 /* English */, - ); - name = Localizable.strings; - sourceTree = ""; - }; - 5506636114AB91C100C7C565 /* Credits.rtf */ = { - isa = PBXVariantGroup; - children = ( - 5506636214AB91C100C7C565 /* English */, - ); - name = Credits.rtf; - sourceTree = ""; - }; 5506636314AB91C100C7C565 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -588,33 +709,75 @@ name = InfoPlist.strings; sourceTree = ""; }; - 5506636514AB91C100C7C565 /* Localizable.strings */ = { + 5545886A1783E5FE008A7407 /* Credits.rtf */ = { isa = PBXVariantGroup; children = ( - 5506636614AB91C100C7C565 /* English */, + 5545886B1783E5FE008A7407 /* English */, ); - name = Localizable.strings; + name = Credits.rtf; sourceTree = ""; }; - 5506636714AB91C100C7C565 /* NetSfPeopsSpuSDLPluginMain.xib */ = { + 5545886C1783E5FE008A7407 /* Localizable.strings */ = { isa = PBXVariantGroup; children = ( - 5506636814AB91C100C7C565 /* English */, + 5545886D1783E5FE008A7407 /* English */, ); - name = NetSfPeopsSpuSDLPluginMain.xib; + name = Localizable.strings; sourceTree = ""; }; - 5506639814AB9E0300C7C565 /* NetSfPeopsSpuALPluginMain.xib */ = { + 5545886E1783E5FE008A7407 /* NetSfPeopsSpuPluginMain.xib */ = { isa = PBXVariantGroup; children = ( - 5506639914AB9E0300C7C565 /* English */, + 5545886F1783E5FE008A7407 /* English */, ); - name = NetSfPeopsSpuALPluginMain.xib; + name = NetSfPeopsSpuPluginMain.xib; sourceTree = ""; }; /* 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/Credits.rtf b/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Credits.rtf deleted file mode 100644 index 3847a9c0..00000000 --- a/macosx/plugins/DFSound/Resorces/OpenAL/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/OpenAL/English.lproj/Localizable.strings b/macosx/plugins/DFSound/Resorces/OpenAL/English.lproj/Localizable.strings deleted file mode 100644 index cc95ea1d..00000000 --- a/macosx/plugins/DFSound/Resorces/OpenAL/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/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 @@ - - - - 1060 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - NSView - NSCustomObject - NSWindowTemplate - NSTextField - NSTextFieldCell - NSSliderCell - NSSlider - NSButtonCell - NSButton - NSBox - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - NetSfPeopsSPUALPluginController - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{128, 348}, {466, 337}} - 1886912512 - SPU Configuration - NSWindow - - View - - - {213, 107} - - - 256 - - - - 256 - - - - 274 - - - - 256 - {{13, 86}, {96, 17}} - - - - YES - - 67239424 - 4194304 - Reverb: - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{127, 84}, {144, 26}} - - - - YES - - 67501824 - 0 - - - - - Helvetica - 12 - 16 - - - 2 - 0.0 - 1 - 0.0 - 3 - 1 - YES - NO - - - - - 256 - {{13, 54}, {96, 17}} - - - - YES - - 67239424 - 4194304 - Interpolation: - - - - - - - - - 256 - {{127, 52}, {144, 26}} - - - - YES - - 67501824 - 0 - - - - - - 3 - 0.0 - 1 - 0.0 - 4 - 1 - YES - NO - - - - - 256 - {{274, 83}, {133, 17}} - - - - YES - - 67239424 - 71303168 - (Simple Reverb) - - LucidaGrande - 11 - 3100 - - - - - - - - - 256 - {{274, 51}, {133, 17}} - - - - YES - - 67239424 - 71303168 - (Simple Interpolation) - - - - - - - - - 256 - {{13, 21}, {96, 17}} - - - - YES - - 67239424 - 4194304 - Volume: - - - - - - - - - 256 - {{127, 19}, {144, 26}} - - - - YES - - 67501824 - 0 - - - - - - 4 - 0.0 - 3 - 0.0 - 5 - 1 - YES - NO - - - - - 256 - {{274, 18}, {133, 17}} - - - - YES - - 67239424 - 71303168 - (Loud) - - - - - - - - {{2, 2}, {428, 127}} - - - - - - {{17, 173}, {432, 144}} - - - - {0, 0} - - 67239424 - 0 - General Settings - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - - - - 274 - - - - 256 - {{21, 60}, {153, 18}} - - - - YES - - 67239424 - 0 - Change XA Speed - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - {{2, 2}, {189, 96}} - - - - - - {{256, 56}, {193, 113}} - - - - {0, 0} - - 67239424 - 0 - XA Music - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - - - - 274 - - - - 256 - {{18, 58}, {199, 18}} - - - - YES - - 67239424 - 0 - High Compatibility Mode - - - 1211912703 - 2 - - NSImage - NSSwitch - - - - - 200 - 25 - - - - - 256 - {{18, 38}, {199, 18}} - - - - YES - - 67239424 - 0 - SPU IRQ Wait - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 16}, {199, 18}} - - - - YES - - 67239424 - 0 - Mono Sound - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{2, 2}, {224, 96}} - - - - - - {{17, 56}, {228, 113}} - - - - {0, 0} - - 67239424 - 0 - Misc - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{330, 12}, {122, 32}} - - - YES - - 67239424 - 134217728 - OK - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - {{208, 12}, {122, 32}} - - - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - - 256 - {{14, 12}, {122, 32}} - - - - YES - - 67239424 - 134217728 - Reset - - - -2038284033 - 1 - - - - 200 - 25 - - - - {466, 337} - - - - - {{0, 0}, {1680, 1028}} - {213, 129} - {10000000000000, 10000000000000} - YES - - - - - - - window - - - - 39 - - - - ok: - - - - 60 - - - - cancel: - - - - 61 - - - - reset: - - - - 63 - - - - reverbValue - - - - 58 - - - - interpolValue - - - - 55 - - - - volumeValue - - - - 75 - - - - xaSpeedBox - - - - 66 - - - - hiCompBox - - - - 54 - - - - irqWaitBox - - - - 56 - - - - monoSoundBox - - - - 57 - - - - delegate - - - - 43 - - - - initialFirstResponder - - - - 53 - - - - nextKeyView - - - - 44 - - - - nextKeyView - - - - 45 - - - - takeStringValueFrom: - - - - 41 - - - - takeStringValueFrom: - - - - 42 - - - - nextKeyView - - - - 50 - - - - nextKeyView - - - - 47 - - - - nextKeyView - - - - 51 - - - - nextKeyView - - - - 52 - - - - nextKeyView - - - - 76 - - - - takeStringValueFrom: - - - - 78 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 6 - - - - - - Configuration - - - 5 - - - - - - - - - - - - - 9 - - - - - - - - - - - - - - - - 19 - - - - - - - - 24 - - - - - - - - - - 37 - - - - - - - - 38 - - - - - - - - 62 - - - - - - - - 93 - - - - - 94 - - - - - 95 - - - - - -3 - - - Application - - - 11 - - - - - - - - 80 - - - - - 12 - - - - - - - - 81 - - - - - 15 - - - - - - - - 82 - - - - - 16 - - - - - - - - 83 - - - - - 17 - - - - - - - - 84 - - - - - 18 - - - - - - - - 85 - - - - - 69 - - - - - - - - 86 - - - - - 70 - - - - - - - - 87 - - - - - 71 - - - - - - - - 88 - - - - - 22 - - - - - - - - 89 - - - - - 25 - - - - - - - - 90 - - - - - 26 - - - - - - - - 91 - - - - - 33 - - - - - - - - 92 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NetSfPeopsSPUALPluginNamedSlider - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NetSfPeopsSPUALPluginNamedSlider - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Should always be enabled. Only disable this option if the emulator doesn't support the SPUupdate/async plugin interface. - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - When enabled the plugin will waits for CPU action which a few games requires (Metal Gears Solid + others) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NetSfPeopsSPUALPluginNamedSlider - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 95 - - - - - NetSfPeopsSPUALPluginController - NSWindowController - - IBProjectSource - ./Classes/NetSfPeopsSPUALPluginController.h - - - - NetSfPeopsSPUALPluginNamedSlider - NSSlider - - IBProjectSource - ./Classes/NetSfPeopsSPUALPluginNamedSlider.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - NSSwitch - {15, 15} - - - 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/SDL/English.lproj/NetSfPeopsSpuSDLPluginMain.xib b/macosx/plugins/DFSound/Resorces/SDL/English.lproj/NetSfPeopsSpuSDLPluginMain.xib deleted file mode 100644 index 74a1170d..00000000 --- a/macosx/plugins/DFSound/Resorces/SDL/English.lproj/NetSfPeopsSpuSDLPluginMain.xib +++ /dev/null @@ -1,1197 +0,0 @@ - - - - 1060 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - NSView - NSCustomObject - NSWindowTemplate - NSTextField - NSTextFieldCell - NSSliderCell - NSSlider - NSButtonCell - NSButton - NSBox - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - NetSfPeopsSPUSDLPluginController - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{128, 348}, {466, 337}} - 1886912512 - SPU Configuration - NSWindow - - View - - - {213, 107} - - - 256 - - - - 256 - - - - 274 - - - - 256 - {{13, 86}, {96, 17}} - - - - YES - - 67239424 - 4194304 - Reverb: - - LucidaGrande - 13 - 1044 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 256 - {{127, 84}, {144, 26}} - - - - YES - - 67501824 - 0 - - - - - Helvetica - 12 - 16 - - - 2 - 0.0 - 1 - 0.0 - 3 - 1 - YES - NO - - - - - 256 - {{13, 54}, {96, 17}} - - - - YES - - 67239424 - 4194304 - Interpolation: - - - - - - - - - 256 - {{127, 52}, {144, 26}} - - - - YES - - 67501824 - 0 - - - - - - 3 - 0.0 - 1 - 0.0 - 4 - 1 - YES - NO - - - - - 256 - {{274, 83}, {133, 17}} - - - - YES - - 67239424 - 71303168 - (Simple Reverb) - - LucidaGrande - 11 - 3100 - - - - - - - - - 256 - {{274, 51}, {133, 17}} - - - - YES - - 67239424 - 71303168 - (Simple Interpolation) - - - - - - - - - 256 - {{13, 21}, {96, 17}} - - - - YES - - 67239424 - 4194304 - Volume: - - - - - - - - - 256 - {{127, 19}, {144, 26}} - - - - YES - - 67501824 - 0 - - - - - - 4 - 0.0 - 3 - 0.0 - 5 - 1 - YES - NO - - - - - 256 - {{274, 18}, {133, 17}} - - - - YES - - 67239424 - 71303168 - (Loud) - - - - - - - - {{2, 2}, {428, 127}} - - - - - - {{17, 173}, {432, 144}} - - - - {0, 0} - - 67239424 - 0 - General Settings - - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - - - - 274 - - - - 256 - {{21, 60}, {153, 18}} - - - - YES - - 67239424 - 0 - Change XA Speed - - - 1211912703 - 2 - - NSSwitch - - - - 200 - 25 - - - - {{2, 2}, {189, 96}} - - - - - - {{256, 56}, {193, 113}} - - - - {0, 0} - - 67239424 - 0 - XA Music - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - - - - 274 - - - - 256 - {{18, 58}, {199, 18}} - - - - YES - - 67239424 - 0 - High Compatibility Mode - - - 1211912703 - 2 - - NSImage - NSSwitch - - - - - 200 - 25 - - - - - 256 - {{18, 38}, {199, 18}} - - - - YES - - 67239424 - 0 - SPU IRQ Wait - - - 1211912703 - 2 - - - - - 200 - 25 - - - - - 256 - {{18, 16}, {199, 18}} - - - - YES - - 67239424 - 0 - Mono Sound - - - 1211912703 - 2 - - - - 200 - 25 - - - - {{2, 2}, {224, 96}} - - - - - - {{17, 56}, {228, 113}} - - - - {0, 0} - - 67239424 - 0 - Misc - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 3 - 0 - 2 - NO - - - - 256 - {{330, 12}, {122, 32}} - - - YES - - 67239424 - 134217728 - OK - - - -2038284033 - 1 - - - DQ - 200 - 25 - - - - - 256 - {{208, 12}, {122, 32}} - - - - YES - - 67239424 - 134217728 - Cancel - - - -2038284033 - 1 - - - Gw - 200 - 25 - - - - - 256 - {{14, 12}, {122, 32}} - - - - YES - - 67239424 - 134217728 - Reset - - - -2038284033 - 1 - - - - 200 - 25 - - - - {466, 337} - - - - - {{0, 0}, {1680, 1028}} - {213, 129} - {10000000000000, 10000000000000} - YES - - - - - - - window - - - - 39 - - - - ok: - - - - 60 - - - - cancel: - - - - 61 - - - - reset: - - - - 63 - - - - reverbValue - - - - 58 - - - - interpolValue - - - - 55 - - - - volumeValue - - - - 75 - - - - xaSpeedBox - - - - 66 - - - - hiCompBox - - - - 54 - - - - irqWaitBox - - - - 56 - - - - monoSoundBox - - - - 57 - - - - delegate - - - - 43 - - - - initialFirstResponder - - - - 53 - - - - nextKeyView - - - - 44 - - - - nextKeyView - - - - 45 - - - - takeStringValueFrom: - - - - 41 - - - - takeStringValueFrom: - - - - 42 - - - - nextKeyView - - - - 50 - - - - nextKeyView - - - - 47 - - - - nextKeyView - - - - 51 - - - - nextKeyView - - - - 52 - - - - nextKeyView - - - - 76 - - - - takeStringValueFrom: - - - - 78 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - 6 - - - - - - Configuration - - - 5 - - - - - - - - - - - - - 9 - - - - - - - - - - - - - - - - 19 - - - - - - - - 24 - - - - - - - - - - 37 - - - - - - - - 38 - - - - - - - - 62 - - - - - - - - 93 - - - - - 94 - - - - - 95 - - - - - -3 - - - Application - - - 11 - - - - - - - - 80 - - - - - 12 - - - - - - - - 81 - - - - - 15 - - - - - - - - 82 - - - - - 16 - - - - - - - - 83 - - - - - 17 - - - - - - - - 84 - - - - - 18 - - - - - - - - 85 - - - - - 69 - - - - - - - - 86 - - - - - 70 - - - - - - - - 87 - - - - - 71 - - - - - - - - 88 - - - - - 22 - - - - - - - - 89 - - - - - 25 - - - - - - - - 90 - - - - - 26 - - - - - - - - 91 - - - - - 33 - - - - - - - - 92 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NetSfPeopsSPUSDLPluginNamedSlider - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NetSfPeopsSPUSDLPluginNamedSlider - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - Should always be enabled. Only disable this option if the emulator doesn't support the SPUupdate/async plugin interface. - - - com.apple.InterfaceBuilder.CocoaPlugin - - ToolTip - - ToolTip - - When enabled the plugin will waits for CPU action which a few games requires (Metal Gears Solid + others) - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NetSfPeopsSPUSDLPluginNamedSlider - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 95 - - - - - NetSfPeopsSPUSDLPluginController - NSWindowController - - NSControl - NetSfPeopsSPUSDLPluginNamedSlider - NSControl - NSControl - NetSfPeopsSPUSDLPluginNamedSlider - NetSfPeopsSPUSDLPluginNamedSlider - NSControl - NSControl - - - - hiCompBox - NSControl - - - interpolValue - NetSfPeopsSPUSDLPluginNamedSlider - - - irqWaitBox - NSControl - - - monoSoundBox - NSControl - - - reverbValue - NetSfPeopsSPUSDLPluginNamedSlider - - - volumeValue - NetSfPeopsSPUSDLPluginNamedSlider - - - xaEnableBox - NSControl - - - xaSpeedBox - NSControl - - - - IBProjectSource - ./Classes/NetSfPeopsSPUSDLPluginController.h - - - - NetSfPeopsSPUSDLPluginNamedSlider - NSSlider - - IBProjectSource - ./Classes/NetSfPeopsSPUSDLPluginNamedSlider.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - YES - 3 - - NSSwitch - {15, 15} - - - diff --git a/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf new file mode 100644 index 00000000..3847a9c0 --- /dev/null +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Credits.rtf @@ -0,0 +1,13 @@ +{\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/Shared/English.lproj/Localizable.strings b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Localizable.strings new file mode 100644 index 00000000..9c4b6b4f --- /dev/null +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/Localizable.strings @@ -0,0 +1,33 @@ +/* + 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"; + +/*Unknown/not found value */ +"(Unknown)" = "(Unknown)"; + +/* 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/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib new file mode 100644 index 00000000..86afd475 --- /dev/null +++ b/macosx/plugins/DFSound/Resorces/Shared/English.lproj/NetSfPeopsSpuPluginMain.xib @@ -0,0 +1,1229 @@ + + + + 1060 + 12E55 + 3084 + 1187.39 + 626.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 3084 + + + NSBox + NSButton + NSButtonCell + NSCustomObject + NSSlider + NSSliderCell + NSTextField + NSTextFieldCell + NSView + NSWindowTemplate + + + com.apple.InterfaceBuilder.CocoaPlugin + + + PluginDependencyRecalculationVersion + + + + + SPUPluginController + + + FirstResponder + + + NSApplication + + + 1 + 2 + {{128, 348}, {466, 337}} + 1886912512 + SPU Configuration + NSWindow + + View + + + {213, 107} + + + 256 + + + + 256 + + + + 274 + + + + 256 + {{13, 86}, {96, 17}} + + + + YES + + 67108864 + 4194304 + Reverb: + + LucidaGrande + 13 + 1044 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + NO + + + + 256 + {{127, 84}, {144, 26}} + + + + YES + + 67371264 + 0 + + + + + Helvetica + 12 + 16 + + + 2 + 0.0 + 1 + 0.0 + 3 + 1 + YES + NO + + NO + + + + 256 + {{13, 54}, {96, 17}} + + + + YES + + 67108864 + 4194304 + Interpolation: + + + + + + NO + + + + 256 + {{127, 52}, {144, 26}} + + + + YES + + 67371264 + 0 + + + + + + 3 + 0.0 + 1 + 0.0 + 4 + 1 + YES + NO + + NO + + + + 256 + {{274, 83}, {133, 17}} + + + + YES + + 67108864 + 71303168 + (Simple Reverb) + + LucidaGrande + 11 + 3100 + + + + + + NO + + + + 256 + {{274, 51}, {133, 17}} + + + + YES + + 67108864 + 71303168 + (Simple Interpolation) + + + + + + NO + + + + 256 + {{13, 21}, {96, 17}} + + + + YES + + 67108864 + 4194304 + Volume: + + + + + + NO + + + + 256 + {{127, 19}, {144, 26}} + + + + YES + + 67371264 + 0 + + + + + + 4 + 0.0 + 3 + 0.0 + 5 + 1 + YES + NO + + NO + + + + 256 + {{274, 18}, {133, 17}} + + + + YES + + 67108864 + 71303168 + (Loud) + + + + + + NO + + + {{2, 2}, {428, 127}} + + + + + + {{17, 173}, {432, 144}} + + + + {0, 0} + + 67108864 + 0 + General Settings + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 2 + NO + + + + 256 + + + + 274 + + + + 256 + {{21, 60}, {153, 18}} + + + + YES + + 67108864 + 0 + Change XA Speed + + + 1211912448 + 2 + + NSSwitch + + + + 200 + 25 + + NO + + + {{2, 2}, {189, 96}} + + + + + + {{256, 56}, {193, 113}} + + + + {0, 0} + + 67108864 + 0 + XA Music + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 2 + NO + + + + 256 + + + + 274 + + + + 256 + {{18, 58}, {199, 18}} + + + + YES + + 67108864 + 0 + High Compatibility Mode + + + 1211912448 + 2 + + NSImage + NSSwitch + + + + + 200 + 25 + + NO + + + + 256 + {{18, 38}, {199, 18}} + + + + YES + + 67108864 + 0 + SPU IRQ Wait + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + + + + 256 + {{18, 16}, {199, 18}} + + + + YES + + 67108864 + 0 + Mono Sound + + + 1211912448 + 2 + + + + 200 + 25 + + NO + + + {{2, 2}, {224, 96}} + + + + + + {{17, 56}, {228, 113}} + + + + {0, 0} + + 67108864 + 0 + Misc + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 2 + NO + + + + 256 + {{330, 12}, {122, 32}} + + + + YES + + 67108864 + 134217728 + OK + + + -2038284288 + 1 + + + DQ + 200 + 25 + + NO + + + + 256 + {{208, 12}, {122, 32}} + + + + YES + + 67108864 + 134217728 + Cancel + + + -2038284288 + 1 + + + Gw + 200 + 25 + + NO + + + + 256 + {{14, 12}, {122, 32}} + + + + YES + + 67108864 + 134217728 + Reset + + + -2038284288 + 1 + + + + 200 + 25 + + NO + + + {466, 337} + + + + + {{0, 0}, {1920, 1058}} + {213, 129} + {10000000000000, 10000000000000} + YES + + + + + + + window + + + + 39 + + + + ok: + + + + 60 + + + + cancel: + + + + 61 + + + + reset: + + + + 63 + + + + reverbValue + + + + 58 + + + + interpolValue + + + + 55 + + + + volumeValue + + + + 75 + + + + xaSpeedBox + + + + 66 + + + + hiCompBox + + + + 54 + + + + irqWaitBox + + + + 56 + + + + monoSoundBox + + + + 57 + + + + delegate + + + + 43 + + + + initialFirstResponder + + + + 53 + + + + nextKeyView + + + + 44 + + + + nextKeyView + + + + 45 + + + + takeStringValueFrom: + + + + 41 + + + + takeStringValueFrom: + + + + 42 + + + + nextKeyView + + + + 50 + + + + nextKeyView + + + + 47 + + + + nextKeyView + + + + 51 + + + + nextKeyView + + + + 52 + + + + nextKeyView + + + + 76 + + + + takeStringValueFrom: + + + + 78 + + + + + + 0 + + + + + + -2 + + + File's Owner + + + -1 + + + First Responder + + + 6 + + + + + + Configuration + + + 5 + + + + + + + + + + + + + 9 + + + + + + + + + + + + + + + + 19 + + + + + + + + 24 + + + + + + + + + + 37 + + + + + + + + 38 + + + + + + + + 62 + + + + + + + + 93 + + + + + 94 + + + + + 95 + + + + + -3 + + + Application + + + 11 + + + + + + + + 80 + + + + + 12 + + + + + + + + 81 + + + + + 15 + + + + + + + + 82 + + + + + 16 + + + + + + + + 83 + + + + + 17 + + + + + + + + 84 + + + + + 18 + + + + + + + + 85 + + + + + 69 + + + + + + + + 86 + + + + + 70 + + + + + + + + 87 + + + + + 71 + + + + + + + + 88 + + + + + 22 + + + + + + + + 89 + + + + + 25 + + + + + + + + 90 + + + + + 26 + + + + + + + + 91 + + + + + 33 + + + + + + + + 92 + + + + + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + NamedSlider + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + NamedSlider + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + Should always be enabled. Only disable this option if the emulator doesn't support the SPUupdate/async plugin interface. + + + com.apple.InterfaceBuilder.CocoaPlugin + + ToolTip + + ToolTip + + When enabled the plugin will waits for CPU action which a few games requires (Metal Gears Solid + others) + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + NamedSlider + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + + + + + 95 + + + + + NamedSlider + NSSlider + + IBProjectSource + ./Classes/NamedSlider.h + + + + SPUPluginController + NSWindowController + + id + id + id + + + + cancel: + id + + + ok: + id + + + reset: + id + + + + NSControl + NamedSlider + NSControl + NSControl + NamedSlider + NamedSlider + NSControl + NSControl + + + + hiCompBox + NSControl + + + interpolValue + NamedSlider + + + irqWaitBox + NSControl + + + monoSoundBox + NSControl + + + reverbValue + NamedSlider + + + volumeValue + NamedSlider + + + xaEnableBox + NSControl + + + xaSpeedBox + NSControl + + + + IBProjectSource + ./Classes/SPUPluginController.h + + + + + 0 + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + YES + 3 + + NSSwitch + {15, 15} + + + 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 -#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 -#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 +#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 -- cgit v1.2.3