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 --- macosx/plugins/DFSound/macsrc/PluginController.h | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'macosx/plugins/DFSound/macsrc/PluginController.h') 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 -- cgit v1.2.3