diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-12-28 18:52:18 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2011-12-28 18:52:18 +0000 |
| commit | 36c58f3192e5c71a9b0c2e7bc9924f3ad6da0e39 (patch) | |
| tree | c202fd05f2adef306974938770838009ce0e8f0d /macosx/plugins/DFSound/macsrc | |
| parent | d1f289eed65ab08f6f1f8b4dff61ec50f887c1c4 (diff) | |
| download | pcsxr-36c58f3192e5c71a9b0c2e7bc9924f3ad6da0e39.tar.gz | |
rearranging Sound plug-in for Mac.
Renamed PeopsSPU plugin to PeopsSpuSDL to reflect its use of SDL.
Renamed PeopsAL plugin to PeopsSpuAL.
Prevent Objective-C class clashing between the sound plug-ins by renaming the named slider class based on which plug-in is being built.
Splitting resources between the two different sound plug-ins.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@73841 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFSound/macsrc')
| -rw-r--r-- | macosx/plugins/DFSound/macsrc/NamedSlider.h | 6 | ||||
| -rw-r--r-- | macosx/plugins/DFSound/macsrc/PluginController.h | 10 | ||||
| -rw-r--r-- | macosx/plugins/DFSound/macsrc/PluginController.m | 6 |
3 files changed, 15 insertions, 7 deletions
diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.h b/macosx/plugins/DFSound/macsrc/NamedSlider.h index c5a40aa0..38c38f9e 100644 --- a/macosx/plugins/DFSound/macsrc/NamedSlider.h +++ b/macosx/plugins/DFSound/macsrc/NamedSlider.h @@ -2,7 +2,11 @@ #import <Cocoa/Cocoa.h> -#define NamedSlider NetSfPeopsSPUPluginNamedSlider +#ifdef USEOPENAL +#define NamedSlider NetSfPeopsSPUALPluginNamedSlider +#else +#define NamedSlider NetSfPeopsSPUSDLPluginNamedSlider +#endif @interface NamedSlider : NSSlider { diff --git a/macosx/plugins/DFSound/macsrc/PluginController.h b/macosx/plugins/DFSound/macsrc/PluginController.h index 3de02397..10f2752c 100644 --- a/macosx/plugins/DFSound/macsrc/PluginController.h +++ b/macosx/plugins/DFSound/macsrc/PluginController.h @@ -4,21 +4,21 @@ #import "NamedSlider.h" #ifdef USEOPENAL -#define PluginController NetSfPeopsALPluginController +#define PluginController NetSfPeopsSPUALPluginController #else -#define PluginController NetSfPeopsSPUPluginController +#define PluginController NetSfPeopsSPUSDLPluginController #endif @interface PluginController : NSWindowController { IBOutlet NSControl *hiCompBox; - IBOutlet NetSfPeopsSPUPluginNamedSlider *interpolValue; + IBOutlet NamedSlider *interpolValue; IBOutlet NSControl *irqWaitBox; IBOutlet NSControl *monoSoundBox; - IBOutlet NetSfPeopsSPUPluginNamedSlider *reverbValue; + IBOutlet NamedSlider *reverbValue; IBOutlet NSControl *xaEnableBox; IBOutlet NSControl *xaSpeedBox; - IBOutlet NetSfPeopsSPUPluginNamedSlider *volumeValue; + IBOutlet NamedSlider *volumeValue; NSMutableDictionary *keyValues; } diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m index 25c55c74..915eb573 100644 --- a/macosx/plugins/DFSound/macsrc/PluginController.m +++ b/macosx/plugins/DFSound/macsrc/PluginController.m @@ -81,7 +81,11 @@ long DoConfiguration() NSWindow *window; if (pluginController == nil) { - pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuPluginMain"]; +#ifdef USEOPENAL + pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuALPluginMain"]; +#else + pluginController = [[PluginController alloc] initWithWindowNibName:@"NetSfPeopsSpuSDLPluginMain"]; +#endif } window = [pluginController window]; |