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 --- .../Resorces/OpenAL/English.lproj/Credits.rtf | 13 - .../OpenAL/English.lproj/Localizable.strings | 30 - .../English.lproj/NetSfPeopsSpuALPluginMain.xib | 1153 -------------------- 3 files changed, 1196 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 (limited to 'macosx/plugins/DFSound/Resorces/OpenAL') 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} - - - -- cgit v1.2.3