Quieting a warning in OS X localization implementation.

Fixing a few bugs on the OS X Software Shader support, and adding a quality selector.
Changing the hacks type used in the Mac preference selector from unsigned long to unsigned int.

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

5 files changed, 233 insertions, 41 deletions

diff --git a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
index 0e8ab649..6e1e39a8 100644
--- a/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
+++ b/macosx/plugins/DFXVideo/English.lproj/NetSfPeopsSoftGPUConfig.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">12B19</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2549</string>
-		<string key="IBDocument.AppKitVersion">1187</string>
-		<string key="IBDocument.HIToolboxVersion">624.00</string>
+		<string key="IBDocument.SystemVersion">12C54</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2840</string>
+		<string key="IBDocument.AppKitVersion">1187.34</string>
+		<string key="IBDocument.HIToolboxVersion">625.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">2549</string>
+			<string key="NS.object.0">2840</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSBox</string>
@@ -44,7 +44,7 @@
 			<object class="NSWindowTemplate" id="367816088">
 				<int key="NSWindowStyleMask">1</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{411, 163}, {466, 492}}</string>
+				<string key="NSWindowRect">{{411, 163}, {466, 516}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">GPU Configuration</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -91,7 +91,6 @@
 							<string key="NSFrame">{{330, 13}, {122, 32}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
-							<reference key="NSNextKeyView"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="1004944998">
 								<int key="NSCellFlags">67108864</int>
@@ -451,7 +450,7 @@ A</string>
 									<reference key="NSNextKeyView" ref="116814744"/>
 								</object>
 							</array>
-							<string key="NSFrame">{{17, 155}, {432, 192}}</string>
+							<string key="NSFrame">{{17, 179}, {432, 192}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="550029143"/>
@@ -592,7 +591,7 @@ A</string>
 									<reference key="NSNextKeyView" ref="1001322100"/>
 								</object>
 							</array>
-							<string key="NSFrame">{{17, 351}, {211, 135}}</string>
+							<string key="NSFrame">{{17, 375}, {211, 135}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="748477628"/>
@@ -732,7 +731,7 @@ A</string>
 											<string key="NSFrame">{{16, 36}, {131, 18}}</string>
 											<reference key="NSSuperview" ref="562355593"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="863974442"/>
+											<reference key="NSNextKeyView" ref="1070447769"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="271611192">
 												<int key="NSCellFlags">67108864</int>
@@ -756,7 +755,7 @@ A</string>
 											<string key="NSFrame">{{16, 16}, {118, 18}}</string>
 											<reference key="NSSuperview" ref="562355593"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="828910870"/>
+											<reference key="NSNextKeyView" ref="863974442"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="1021627436">
@@ -787,7 +786,7 @@ A</string>
 									<reference key="NSNextKeyView" ref="574316115"/>
 								</object>
 							</array>
-							<string key="NSFrame">{{239, 351}, {210, 135}}</string>
+							<string key="NSFrame">{{239, 375}, {210, 135}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="562355593"/>
@@ -820,7 +819,7 @@ A</string>
 										<object class="NSButton" id="374928377">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{333, 40}, {89, 32}}</string>
+											<string key="NSFrame">{{333, 64}, {89, 32}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="929478763"/>
@@ -846,7 +845,7 @@ A</string>
 										<object class="NSButton" id="285922344">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{333, 7}, {89, 32}}</string>
+											<string key="NSFrame">{{333, 31}, {89, 32}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="77688835"/>
@@ -872,7 +871,7 @@ A</string>
 										<object class="NSTextField" id="1013340557">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{85, 49}, {249, 17}}</string>
+											<string key="NSFrame">{{85, 73}, {249, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="374928377"/>
@@ -893,10 +892,10 @@ A</string>
 										<object class="NSTextField" id="145781561">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{85, 19}, {249, 17}}</string>
+											<string key="NSFrame">{{85, 43}, {249, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
-											<reference key="NSNextKeyView" ref="285922344"/>
+											<reference key="NSNextKeyView" ref="524625855"/>
 											<string key="NSReuseIdentifierKey">_NS:1535</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="469973994">
@@ -914,7 +913,7 @@ A</string>
 										<object class="NSTextField" id="828910870">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{15, 49}, {50, 17}}</string>
+											<string key="NSFrame">{{15, 73}, {50, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="1013340557"/>
@@ -935,7 +934,7 @@ A</string>
 										<object class="NSTextField" id="929478763">
 											<reference key="NSNextResponder" ref="931431086"/>
 											<int key="NSvFlags">268</int>
-											<string key="NSFrame">{{15, 19}, {68, 17}}</string>
+											<string key="NSFrame">{{15, 43}, {68, 17}}</string>
 											<reference key="NSSuperview" ref="931431086"/>
 											<reference key="NSWindow"/>
 											<reference key="NSNextKeyView" ref="145781561"/>
@@ -953,15 +952,116 @@ A</string>
 											</object>
 											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 										</object>
+										<object class="NSPopUpButton" id="637092375">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{85, 11}, {100, 26}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="285922344"/>
+											<string key="NSReuseIdentifierKey">_NS:9</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSPopUpButtonCell" key="NSCell" id="377783502">
+												<int key="NSCellFlags">-2076180416</int>
+												<int key="NSCellFlags2">2048</int>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:9</string>
+												<reference key="NSControlView" ref="637092375"/>
+												<int key="NSButtonFlags">109199360</int>
+												<int key="NSButtonFlags2">129</int>
+												<string key="NSAlternateContents"/>
+												<string key="NSKeyEquivalent"/>
+												<int key="NSPeriodicDelay">400</int>
+												<int key="NSPeriodicInterval">75</int>
+												<nil key="NSMenuItem"/>
+												<bool key="NSMenuItemRespectAlignment">YES</bool>
+												<object class="NSMenu" key="NSMenu" id="111861017">
+													<string key="NSTitle">OtherViews</string>
+													<array class="NSMutableArray" key="NSMenuItems">
+														<object class="NSMenuItem" id="922750945">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">1.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">1</int>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+														<object class="NSMenuItem" id="406832684">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">2.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<int key="NSTag">2</int>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+														<object class="NSMenuItem" id="458639587">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">3.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSKeyEquivModMask">1048576</int>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+														<object class="NSMenuItem" id="445311213">
+															<reference key="NSMenu" ref="111861017"/>
+															<string key="NSTitle">4.0</string>
+															<string key="NSKeyEquiv"/>
+															<int key="NSMnemonicLoc">2147483647</int>
+															<reference key="NSOnImage" ref="855532810"/>
+															<reference key="NSMixedImage" ref="613505175"/>
+															<string key="NSAction">_popUpItemAction:</string>
+															<reference key="NSTarget" ref="377783502"/>
+														</object>
+													</array>
+													<reference key="NSMenuFont" ref="85522599"/>
+												</object>
+												<int key="NSSelectedIndex">-1</int>
+												<int key="NSPreferredEdge">1</int>
+												<bool key="NSUsesItemFromMenu">YES</bool>
+												<bool key="NSAltersState">YES</bool>
+												<int key="NSArrowPosition">2</int>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
+										<object class="NSTextField" id="524625855">
+											<reference key="NSNextResponder" ref="931431086"/>
+											<int key="NSvFlags">268</int>
+											<string key="NSFrame">{{15, 17}, {53, 17}}</string>
+											<reference key="NSSuperview" ref="931431086"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="637092375"/>
+											<string key="NSReuseIdentifierKey">_NS:1535</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="848824354">
+												<int key="NSCellFlags">68157504</int>
+												<int key="NSCellFlags2">272630784</int>
+												<string key="NSContents">Quality:</string>
+												<reference key="NSSupport" ref="85522599"/>
+												<string key="NSCellIdentifier">_NS:1535</string>
+												<reference key="NSControlView" ref="524625855"/>
+												<reference key="NSBackgroundColor" ref="523712963"/>
+												<reference key="NSTextColor" ref="172448668"/>
+											</object>
+											<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+										</object>
 									</array>
-									<string key="NSFrame">{{1, 1}, {430, 78}}</string>
+									<string key="NSFrame">{{1, 1}, {430, 102}}</string>
 									<reference key="NSSuperview" ref="318614234"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="1070447769"/>
+									<reference key="NSNextKeyView" ref="828910870"/>
 									<string key="NSReuseIdentifierKey">_NS:11</string>
 								</object>
 							</array>
-							<string key="NSFrame">{{17, 57}, {432, 94}}</string>
+							<string key="NSFrame">{{17, 57}, {432, 118}}</string>
 							<reference key="NSSuperview" ref="683836898"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="931431086"/>
@@ -985,7 +1085,7 @@ A</string>
 							<bool key="NSTransparent">NO</bool>
 						</object>
 					</array>
-					<string key="NSFrameSize">{466, 492}</string>
+					<string key="NSFrameSize">{466, 516}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="883494424"/>
@@ -1160,6 +1260,14 @@ A</string>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">shaderQualitySelector</string>
+						<reference key="source" ref="331818130"/>
+						<reference key="destination" ref="637092375"/>
+					</object>
+					<int key="connectionID">233</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="367816088"/>
 						<reference key="destination" ref="331818130"/>
@@ -1453,6 +1561,8 @@ A</string>
 							<reference ref="145781561"/>
 							<reference ref="828910870"/>
 							<reference ref="929478763"/>
+							<reference ref="637092375"/>
+							<reference ref="524625855"/>
 						</array>
 						<reference key="parent" ref="683836898"/>
 					</object>
@@ -1677,6 +1787,66 @@ A</string>
 						<reference key="object" ref="48017917"/>
 						<reference key="parent" ref="828054736"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">219</int>
+						<reference key="object" ref="637092375"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="377783502"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">220</int>
+						<reference key="object" ref="377783502"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="111861017"/>
+						</array>
+						<reference key="parent" ref="637092375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">221</int>
+						<reference key="object" ref="111861017"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="922750945"/>
+							<reference ref="406832684"/>
+							<reference ref="458639587"/>
+							<reference ref="445311213"/>
+						</array>
+						<reference key="parent" ref="377783502"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">222</int>
+						<reference key="object" ref="922750945"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">223</int>
+						<reference key="object" ref="406832684"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">224</int>
+						<reference key="object" ref="458639587"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">225</int>
+						<reference key="object" ref="524625855"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="848824354"/>
+						</array>
+						<reference key="parent" ref="318614234"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">226</int>
+						<reference key="object" ref="848824354"/>
+						<reference key="parent" ref="524625855"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">227</int>
+						<reference key="object" ref="445311213"/>
+						<reference key="parent" ref="111861017"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1788,6 +1958,15 @@ A</string>
 				<string key="195.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="197.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="223.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1890,7 +2069,7 @@ A</string>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">218</int>
+			<int key="maxID">233</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1940,6 +2119,7 @@ A</string>
 						<string key="frameSkipping">NSControl</string>
 						<string key="hackEnable">NSControl</string>
 						<string key="hacksView">NSView</string>
+						<string key="shaderQualitySelector">NSPopUpButton</string>
 						<string key="shaders">NSControl</string>
 						<string key="shadersView">NSView</string>
 						<string key="vSync">NSControl</string>
@@ -1979,6 +2159,10 @@ A</string>
 							<string key="name">hacksView</string>
 							<string key="candidateClassName">NSView</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="shaderQualitySelector">
+							<string key="name">shaderQualitySelector</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="shaders">
 							<string key="name">shaders</string>
 							<string key="candidateClassName">NSControl</string>
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
index ec9c0203..a740ed67 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.h
@@ -19,6 +19,7 @@
 	IBOutlet NSControl *vertexChooser;
 	IBOutlet NSControl *fragmentChooser;
 	IBOutlet NSView *shadersView;
+	IBOutlet NSPopUpButton *shaderQualitySelector;
 	
 	NSURL *vertexPath;
 	NSURL *fragmentPath;
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
index b22167ca..4cb71fa9 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginConfigController.m
@@ -13,7 +13,7 @@
 //If running under Mac OS X, use the Localizable.strings file instead.
 #elif defined(_MACOSX)
 #ifdef PCSXRCORE
-extern char* Pcsxr_locale_text(char* toloc);
+extern const char* Pcsxr_locale_text(char* toloc);
 #define _(String) Pcsxr_locale_text(String)
 #define N_(String) String
 #else
@@ -26,7 +26,7 @@ extern char* Pcsxr_locale_text(char* toloc);
 #define PLUGLOC_x(x,y) x ## y
 #define PLUGLOC_y(x,y) PLUGLOC_x(x,y)
 #define PLUGLOC PLUGLOC_y(PCSXRPLUG,_locale_text)
-extern char* PLUGLOC(char* toloc);
+extern const char* PLUGLOC(char* toloc);
 #define _(String) PLUGLOC(String)
 #define N_(String) String
 #endif
@@ -111,6 +111,13 @@ NSURL *PSXFragmentShader()
 	return [keyValues objectForKey:@"FragmentShader"];
 }
 
+float PSXShaderQuality()
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+	return (float)[[keyValues objectForKey:@"ShaderQuality"] intValue];
+}
+
 
 void ReadConfig(void)
 {
@@ -126,10 +133,11 @@ void ReadConfig(void)
 					[NSNumber numberWithBool:NO], @"VSync",
 					[NSNumber numberWithBool:NO], @"Enable Hacks",
 					[NSNumber numberWithInt:1], @"Dither Mode",
-					[NSNumber numberWithLong:0], @"Hacks",
+					[NSNumber numberWithUnsignedInt:0], @"Hacks",
 					[[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slv"] fileReferenceURL], @"VertexShader",
 					[[selfBundle URLForResource:@"gpuPeteOGL2" withExtension:@"slf"] fileReferenceURL], @"FragmentShader",
 					[NSNumber numberWithBool:NO], @"UseShader",
+					[NSNumber numberWithInt:4], @"ShaderQuality",
 					nil], PrefsKey,
 			nil]];
 	
@@ -143,7 +151,7 @@ void ReadConfig(void)
 	iUseFixes = [[keyValues objectForKey:@"Enable Hacks"] boolValue];
 
 	iUseDither = [[keyValues objectForKey:@"Dither Mode"] intValue];
-	dwCfgFixes = [[keyValues objectForKey:@"Hacks"] longValue];
+	dwCfgFixes = [[keyValues objectForKey:@"Hacks"] unsignedIntValue];
 	
 	iResX = 640;
 	iResY = 480;
@@ -189,10 +197,10 @@ void ReadConfig(void)
 	[writeDic setObject:[NSNumber numberWithInt:[vSync intValue]] forKey:@"VSync"];
 	[writeDic setObject:[NSNumber numberWithInt:[hackEnable intValue]] forKey:@"Enable Hacks"];
 	[writeDic setObject:[NSNumber numberWithInt:[shaders intValue]] forKey:@"UseShader"];
-
+	[writeDic setObject:[NSNumber numberWithInt:[shaderQualitySelector indexOfSelectedItem]] forKey:@"ShaderQuality"];
 	[writeDic setObject:[NSNumber numberWithInt:[ditherMode indexOfSelectedItem]] forKey:@"Dither Mode"];
 	
-	unsigned long hackValues = 0;
+	unsigned int hackValues = 0;
 	NSArray *views = [hacksView subviews];
 	for (NSView *control in views) {
 		if ([control isKindOfClass:[NSButton class]]) {
@@ -254,17 +262,13 @@ void ReadConfig(void)
 			[vertexPath release];
 			vertexPath = [[openPanel URL] copy];
 			[vertexShaderViewablePath setTitleWithMnemonic:[vertexPath path]];
-
 		} else {
 			[fragmentPath release];
 			fragmentPath = [[openPanel URL] copy];
 			[fragmentShaderViewablePath setTitleWithMnemonic:[fragmentPath path]];
-
 		}
 	}
 	
-	
-	
 	[openPanel release];
 }
 
@@ -283,14 +287,17 @@ void ReadConfig(void)
 	[frameSkipping setIntValue:[[keyValues objectForKey:@"Frame Skipping"] intValue]];
 	[vSync setIntValue:[[keyValues objectForKey:@"VSync"] intValue]];
 	[hackEnable setIntValue:[[keyValues objectForKey:@"Enable Hacks"] intValue]];
+	[shaders setIntValue:[[keyValues objectForKey:@"UseShader"] intValue]];
 
 	[ditherMode selectItemAtIndex:[[keyValues objectForKey:@"Dither Mode"] intValue]];
-
+	[shaderQualitySelector selectItemAtIndex:[[keyValues objectForKey:@"ShaderQuality"] intValue]];
+	
 	vertexPath = [[keyValues objectForKey:@"VertexShader"] copy];
 	fragmentPath = [[keyValues objectForKey:@"FragmentShader"] copy];
 	[vertexShaderViewablePath setTitleWithMnemonic:[vertexPath path]];
 	[fragmentShaderViewablePath setTitleWithMnemonic:[fragmentPath path]];
-	unsigned long hackValues = [[keyValues objectForKey:@"Hacks"] longValue];
+	unsigned int hackValues = [[keyValues objectForKey:@"Hacks"] unsignedIntValue];
+	
 	
 	NSArray *views = [hacksView subviews];
 	for (NSView *control in views) {
@@ -300,6 +307,7 @@ void ReadConfig(void)
 	}
 	
 	[self hackToggle:hackEnable];
+	[self toggleShader:shaders];
 }
 
 - (void)awakeFromNib
@@ -319,7 +327,7 @@ void ReadConfig(void)
 
 @end
 
-char* PLUGLOC(char *toloc)
+const char* PLUGLOC(char *toloc)
 {
 	NSBundle *mainBundle = [NSBundle bundleForClass:[PluginConfigController class]];
 	NSString *origString = nil, *transString = nil;
diff --git a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
index 2c79436b..1836ebcd 100644
--- a/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
+++ b/macosx/plugins/DFXVideo/macsrc/PluginGLView.m
@@ -155,10 +155,8 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 
 	if(isShaderEnabled()){
 		// --- Params ---
-		shaderQuality = 4.0;
-		//vertexShader = LoadShader(GL_VERTEX_SHADER,"/Users/you/shader/gpuPeteOGL2.slv");
+		shaderQuality = PSXShaderQuality();
 		vertexShader = [self loadShader:GL_VERTEX_SHADER location:PSXVertexShader()];
-		//fragmentShader = LoadShader(GL_FRAGMENT_SHADER,"/Users/you/shader/gpuPeteOGL2.slf");
 		fragmentShader = [self loadShader:GL_FRAGMENT_SHADER location:PSXFragmentShader()];
 		
 		//--- shader loading ---
@@ -660,7 +658,7 @@ void BlitScreen16NS(unsigned char * surf,long x,long y)
 					GLuint lu2 = *((GLuint *)pD+1);
 					GLuint lu3 = *((GLuint *)pD+2);
 					GLuint *dst = ((GLuint *)((surf)+(column*lPitch)+(row<<2)));
-#ifdef __POWERPC__
+#ifdef __BIG_ENDIAN__
 					*(dst)=
 						(((lu1>>24)&0xff)<<16)|(((lu1>>16)&0xff)<<8)|(((lu1>>8)&0xff));
 					*(dst+1)=
diff --git a/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h b/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
index a4cb1054..27449a69 100644
--- a/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
+++ b/macosx/plugins/DFXVideo/macsrc/SGPUPreferences.h
@@ -14,5 +14,6 @@
 BOOL isShaderEnabled();
 NSURL *PSXFragmentShader();
 NSURL *PSXVertexShader();
+float PSXShaderQuality();
 
 #endif