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

1 files changed, 15 insertions, 14 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;
 }