summaryrefslogtreecommitdiff
path: root/macosx/plugins/DFSound/macsrc
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-10 18:18:15 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2013-09-10 18:18:15 +0000
commita3ac4842bd5c7058b1363f7d3307f61724fc7178 (patch)
tree0e71322d034432a925cbdab2f5e92bc891d3efde /macosx/plugins/DFSound/macsrc
parentaca9c8411f7b86b1ee685965c70e7be682a9a4d0 (diff)
downloadpcsxr-a3ac4842bd5c7058b1363f7d3307f61724fc7178.tar.gz
Remove 32-bit support on OS X.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@87114 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFSound/macsrc')
-rwxr-xr-xmacosx/plugins/DFSound/macsrc/NamedSlider.h3
-rwxr-xr-xmacosx/plugins/DFSound/macsrc/NamedSlider.m10
-rwxr-xr-xmacosx/plugins/DFSound/macsrc/PluginController.m6
-rw-r--r--macosx/plugins/DFSound/macsrc/SPUPluginController.h3
-rw-r--r--macosx/plugins/DFSound/macsrc/SPUPluginController.m9
5 files changed, 4 insertions, 27 deletions
diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.h b/macosx/plugins/DFSound/macsrc/NamedSlider.h
index 95ec014c..6a5c869a 100755
--- a/macosx/plugins/DFSound/macsrc/NamedSlider.h
+++ b/macosx/plugins/DFSound/macsrc/NamedSlider.h
@@ -1,13 +1,12 @@
/* NetSfPeopsSPUPluginNamedSlider */
#import <Cocoa/Cocoa.h>
-#import "ARCBridge.h"
@interface NamedSlider : NSSlider
{
NSArray *strings;
__unsafe_unretained Class pluginClass;
}
-@property (arcretain) NSArray *strings;
+@property (strong) NSArray *strings;
@property (unsafe_unretained) Class pluginClass;
@end
diff --git a/macosx/plugins/DFSound/macsrc/NamedSlider.m b/macosx/plugins/DFSound/macsrc/NamedSlider.m
index 8411481d..90a89eb5 100755
--- a/macosx/plugins/DFSound/macsrc/NamedSlider.m
+++ b/macosx/plugins/DFSound/macsrc/NamedSlider.m
@@ -4,16 +4,6 @@
@synthesize pluginClass;
@synthesize strings;
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
- self.strings = nil;
- self.pluginClass = nil;
-
- [super dealloc];
-}
-#endif
-
- (NSString *)stringValue
{
NSInteger index = [self integerValue];
diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index cc6b330a..12a2b3d7 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -2,7 +2,6 @@
#include "stdafx.h"
#include "externals.h"
#include "maccfg.h"
-#include "ARCBridge.h"
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -62,9 +61,9 @@ void DoAbout()
NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
NSAttributedString *credits;
if (path) {
- credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithPath: path documentAttributes:NULL]);
+ credits = [[NSAttributedString alloc] initWithPath: path documentAttributes:NULL];
} else {
- credits = AUTORELEASEOBJ([[NSAttributedString alloc] initWithString:@""]);
+ credits = [[NSAttributedString alloc] initWithString:@""];
}
// Get Application Icon
@@ -84,7 +83,6 @@ void DoAbout()
dispatch_async(dispatch_get_main_queue(), ^{
[NSApp orderFrontStandardAboutPanelWithOptions:infoPaneDict];
});
- RELEASEOBJ(infoPaneDict);
}
long DoConfiguration()
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.h b/macosx/plugins/DFSound/macsrc/SPUPluginController.h
index c826e58f..d1e6924a 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.h
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.h
@@ -8,7 +8,6 @@
#import <Cocoa/Cocoa.h>
#import "NamedSlider.h"
-#import "ARCBridge.h"
@interface SPUPluginController : NSWindowController
{
@@ -23,7 +22,7 @@
NSMutableDictionary *keyValues;
}
-@property (readwrite, arcretain) NSMutableDictionary *keyValues;
+@property (readwrite, strong) NSMutableDictionary *keyValues;
- (IBAction)cancel:(id)sender;
- (IBAction)ok:(id)sender;
- (IBAction)reset:(id)sender;
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
index 83598618..84ef2876 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.m
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
@@ -60,13 +60,4 @@ static void FuncNotAvailable(id sel, id sender, SEL theCmd)
NotAvailableWarn(nil);
}
-#if !__has_feature(objc_arc)
-- (void)dealloc
-{
- self.keyValues = nil;
-
- [super dealloc];
-}
-#endif
-
@end