Change some +stringWithCString and -initWithCString:encoding: to modern Objective-C syntax.

Change the encoding of a couple of info.plists to UTF-8, otherwise Xcode was complaining.
Removing some extra line breaks on OS X code.
Other minor changes.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85867 e17a0e51-4ae3-4d35-97c3-1a29b211df97

2 files changed, 38 insertions, 32 deletions

diff --git a/macosx/plugins/DFSound/macsrc/PluginController.m b/macosx/plugins/DFSound/macsrc/PluginController.m
index 7b145a21..49cd371b 100755
--- a/macosx/plugins/DFSound/macsrc/PluginController.m
+++ b/macosx/plugins/DFSound/macsrc/PluginController.m
@@ -66,7 +66,7 @@ void DoAbout()
 	[icon setSize:size];
 		
 	NSDictionary *infoPaneDict =
-	[NSDictionary dictionaryWithObjectsAndKeys:
+	[[NSDictionary alloc] initWithObjectsAndKeys:
 	 [bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
 	 icon, @"ApplicationIcon",
 	 [bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
@@ -77,6 +77,7 @@ void DoAbout()
 	dispatch_async(dispatch_get_main_queue(), ^{
 		[app orderFrontStandardAboutPanelWithOptions:infoPaneDict];
 	});
+	RELEASEOBJ(infoPaneDict);
 }
 
 long DoConfiguration()
@@ -189,27 +190,27 @@ void ReadConfig(void)
 {
 	Class thisClass = [self class];
 	
-	NSBundle *mainBundle = [NSBundle bundleForClass:thisClass];
+	NSBundle *spuBundle = [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]]];
+		[spuBundle localizedStringForKey:@"(No Interpolation)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Simple Interpolation)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Gaussian Interpolation)" value:@"" table:nil],
+		[spuBundle 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]]];
+		[spuBundle localizedStringForKey:@"(No Reverb)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Simple Reverb)" value:@"" table:nil],
+		[spuBundle 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]]];
+		[spuBundle localizedStringForKey:@"(Muted)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Low)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Medium)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Loud)" value:@"" table:nil],
+		[spuBundle localizedStringForKey:@"(Loudest)" value:@"" table:nil]]];
 	volumeValue.pluginClass = thisClass;
 }
 
diff --git a/macosx/plugins/DFSound/macsrc/SPUPluginController.m b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
index bfc11f01..da08f700 100644
--- a/macosx/plugins/DFSound/macsrc/SPUPluginController.m
+++ b/macosx/plugins/DFSound/macsrc/SPUPluginController.m
@@ -10,48 +10,53 @@
 
 @implementation SPUPluginController
 
+static Class GetSPUBaseClass()
+{
+	static Class spuBaseClass;
+	if (!spuBaseClass) {
+		spuBaseClass = [SPUPluginController class];
+	}
+	return spuBaseClass;
+}
+
 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]); \
+	NSString *selString = NSStringFromSelector(theCmd);
+	if (sender) {
+		NSLog(@"Class %@ does not implement %@, and was sent a(n) %@ with the description %@", [sel class], selString, [sender class], [sender description]);
+	} else {
+		NSLog(@"Class %@ does not implement %@", [sel class], selString);
+	}
+	if ([sel isMemberOfClass:GetSPUBaseClass()]) {
+		NSLog(@"For one thing, the class %@ isn't supposed to be accessed directly, just subclassed!", GetSPUBaseClass()); \
 	} 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]);
+		NSLog(@"You should implement %@ for your class %@. As it is, you are calling %@ from the superclass %@.", selString, [sel class], selString, GetSPUBaseClass());
 	}
 #endif
 	[sel doesNotRecognizeSelector:theCmd];
 }
 
-#define NotAvailableWarn() FuncNotAvailable(self, sender, _cmd)
+#define NotAvailableWarn(sender) FuncNotAvailable(self, sender, _cmd)
 
 - (IBAction)cancel:(id)sender
 {
-	NotAvailableWarn();
-	
+	NotAvailableWarn(sender);
 }
 
 - (IBAction)ok:(id)sender
 {
-	NotAvailableWarn();
+	NotAvailableWarn(sender);
 }
 
 - (IBAction)reset:(id)sender
 {
-	NotAvailableWarn();
+	NotAvailableWarn(sender);
 }
 
 - (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];
+	NotAvailableWarn(nil);
 }
 
 @end