DFNet for Mac OS X.

Note that DFNet is disabled by default, and there are still a few rough edges.

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

23 files changed, 2088 insertions, 117 deletions

diff --git a/macosx/ConfigurationController.h b/macosx/ConfigurationController.h
index e3901976..ef8e4447 100644
--- a/macosx/ConfigurationController.h
+++ b/macosx/ConfigurationController.h
@@ -10,6 +10,7 @@
     IBOutlet PluginController *graphicsPlugin;
     IBOutlet PluginController *padPlugin;
     IBOutlet PluginController *soundPlugin;
+	IBOutlet PluginController *netPlugin;
 
 	IBOutlet id noXaAudioCell;
 	IBOutlet id sioIrqAlwaysCell;
@@ -24,6 +25,7 @@
 	IBOutlet id rCountFixCell;
 	IBOutlet id vSyncWAFixCell;
 	IBOutlet id noFastBootCell;
+	IBOutlet id enableNetPlayCell;
 
 	IBOutlet NSTextField *mcd1Label;
 	IBOutlet NSTextField *mcd2Label;
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index 9c52375b..7b0782e0 100644
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -133,6 +133,7 @@
 
 	// check that the outlets are active before adding them
 	if (noXaAudioCell) [checkBoxDefaults setObject:noXaAudioCell forKey:@"NoXaAudio"];
+	if (enableNetPlayCell) [checkBoxDefaults setObject:enableNetPlayCell forKey:@"NetPlay"];
 	if (sioIrqAlwaysCell) [checkBoxDefaults setObject:sioIrqAlwaysCell forKey:@"SioIrqAlways"];
 	if (bwMdecCell) [checkBoxDefaults setObject:bwMdecCell forKey:@"BlackAndWhiteMDECVideo"];
 	if (autoVTypeCell) [checkBoxDefaults setObject:autoVTypeCell forKey:@"AutoDetectVideoType"];
@@ -187,6 +188,8 @@
 	[soundPlugin setPluginsTo:[list pluginsForType:PSE_LT_SPU] withType: PSE_LT_SPU];
 	[padPlugin setPluginsTo:[list pluginsForType:PSE_LT_PAD] withType: PSE_LT_PAD];
 	[cdromPlugin setPluginsTo:[list pluginsForType:PSE_LT_CDR] withType: PSE_LT_CDR];
+	[netPlugin setPluginsTo:[list pluginsForType:PSE_LT_NET] withType: PSE_LT_NET];
+
 }
 
 - (void)dealloc
diff --git a/macosx/English.lproj/Configuration.xib b/macosx/English.lproj/Configuration.xib
index 8adbc791..9a3022ff 100644
--- a/macosx/English.lproj/Configuration.xib
+++ b/macosx/English.lproj/Configuration.xib
@@ -47,7 +47,7 @@
 			<object class="NSWindowTemplate" id="379363543">
 				<int key="NSWindowStyleMask">15</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{55, 345}, {552, 268}}</string>
+				<string key="NSWindowRect">{{55, 345}, {552, 360}}</string>
 				<int key="NSWTFlags">807927808</int>
 				<string key="NSWindowTitle">PCSXR Preferences</string>
 				<string key="NSWindowClass">NSWindow</string>
@@ -55,8 +55,8 @@
 					<characters key="NS.bytes">View</characters>
 				</object>
 				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMaxSize">{2000, 268}</string>
-				<string key="NSWindowContentMinSize">{552, 268}</string>
+				<string key="NSWindowContentMaxSize">{2000, 360}</string>
+				<string key="NSWindowContentMinSize">{552, 360}</string>
 				<object class="NSView" key="NSWindowView" id="644483536">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -64,7 +64,7 @@
 						<object class="NSTabView" id="145760790">
 							<reference key="NSNextResponder" ref="644483536"/>
 							<int key="NSvFlags">274</int>
-							<string key="NSFrame">{{13, 10}, {526, 252}}</string>
+							<string key="NSFrame">{{13, 10}, {526, 344}}</string>
 							<reference key="NSSuperview" ref="644483536"/>
 							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="309207255"/>
@@ -88,12 +88,12 @@
 															<object class="NSMatrix" id="260387224">
 																<reference key="NSNextResponder" ref="501435377"/>
 																<int key="NSvFlags">274</int>
-																<string key="NSFrame">{{18, 65}, {141, 84}}</string>
+																<string key="NSFrame">{{18, 51}, {135, 106}}</string>
 																<reference key="NSSuperview" ref="501435377"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="197815183"/>
 																<bool key="NSEnabled">YES</bool>
-																<int key="NSNumRows">4</int>
+																<int key="NSNumRows">5</int>
 																<int key="NSNumCols">1</int>
 																<array class="NSMutableArray" key="NSCells">
 																	<object class="NSButtonCell" id="1001969866">
@@ -206,6 +206,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																		<int key="NSPeriodicDelay">200</int>
 																		<int key="NSPeriodicInterval">25</int>
 																	</object>
+																	<object class="NSButtonCell" id="322742106">
+																		<int key="NSCellFlags">67239424</int>
+																		<int key="NSCellFlags2">0</int>
+																		<string key="NSContents">Enable NetPlay</string>
+																		<reference key="NSSupport" ref="113129670"/>
+																		<reference key="NSControlView" ref="260387224"/>
+																		<int key="NSTag">-1</int>
+																		<int key="NSButtonFlags">1211912703</int>
+																		<int key="NSButtonFlags2">2</int>
+																		<reference key="NSAlternateImage" ref="890331736"/>
+																		<string key="NSAlternateContents"/>
+																		<int key="NSPeriodicDelay">200</int>
+																		<int key="NSPeriodicInterval">25</int>
+																	</object>
 																</array>
 																<string key="NSCellSize">{135, 18}</string>
 																<string key="NSIntercellSpacing">{4, 4}</string>
@@ -394,7 +408,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														<reference key="NSNextKeyView" ref="260387224"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{17, 16}, {179, 184}}</string>
+												<string key="NSFrame">{{17, 108}, {179, 184}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="501435377"/>
@@ -512,7 +526,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														<reference key="NSNextKeyView" ref="263292685"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{212, 109}, {277, 91}}</string>
+												<string key="NSFrame">{{212, 201}, {277, 91}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="593482660"/>
@@ -653,7 +667,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														<reference key="NSNextKeyView" ref="874213588"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{212, 16}, {277, 91}}</string>
+												<string key="NSFrame">{{212, 108}, {277, 91}}</string>
 												<reference key="NSSuperview" ref="309207255"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="584348218"/>
@@ -676,7 +690,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<bool key="NSTransparent">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {506, 206}}</string>
+										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
 										<reference key="NSSuperview" ref="145760790"/>
 										<reference key="NSWindow"/>
 										<reference key="NSNextKeyView" ref="324328678"/>
@@ -814,7 +828,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																		<reference key="NSNextKeyView" ref="983879338"/>
 																	</object>
 																</array>
-																<string key="NSFrame">{{0, 143}, {222, 90}}</string>
+																<string key="NSFrame">{{0, 200}, {222, 90}}</string>
 																<reference key="NSSuperview" ref="613304714"/>
 																<reference key="NSNextKeyView" ref="674673083"/>
 																<string key="NSOffsets">{0, 0}</string>
@@ -953,7 +967,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																		<reference key="NSNextKeyView" ref="184922838"/>
 																	</object>
 																</array>
-																<string key="NSFrame">{{249, 143}, {222, 90}}</string>
+																<string key="NSFrame">{{249, 200}, {222, 90}}</string>
 																<reference key="NSSuperview" ref="613304714"/>
 																<reference key="NSNextKeyView" ref="451090636"/>
 																<string key="NSOffsets">{0, 0}</string>
@@ -1088,7 +1102,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																		<reference key="NSNextKeyView" ref="1001529761"/>
 																	</object>
 																</array>
-																<string key="NSFrame">{{0, 49}, {222, 90}}</string>
+																<string key="NSFrame">{{0, 106}, {222, 90}}</string>
 																<reference key="NSSuperview" ref="613304714"/>
 																<reference key="NSNextKeyView" ref="408048101"/>
 																<string key="NSOffsets">{0, 0}</string>
@@ -1109,6 +1123,140 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<int key="NSTitlePosition">2</int>
 																<bool key="NSTransparent">NO</bool>
 															</object>
+															<object class="NSBox" id="950422833">
+																<reference key="NSNextResponder" ref="613304714"/>
+																<int key="NSvFlags">270</int>
+																<array class="NSMutableArray" key="NSSubviews">
+																	<object class="NSView" id="143420558">
+																		<reference key="NSNextResponder" ref="950422833"/>
+																		<int key="NSvFlags">274</int>
+																		<array class="NSMutableArray" key="NSSubviews">
+																			<object class="NSButton" id="986737125">
+																				<reference key="NSNextResponder" ref="143420558"/>
+																				<int key="NSvFlags">259</int>
+																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
+																				<reference key="NSSuperview" ref="143420558"/>
+																				<reference key="NSNextKeyView" ref="145760790"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="933521081">
+																					<int key="NSCellFlags">67239424</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">Configure</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="986737125"/>
+																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																			</object>
+																			<object class="NSButton" id="181214375">
+																				<reference key="NSNextResponder" ref="143420558"/>
+																				<int key="NSvFlags">262</int>
+																				<string key="NSFrame">{{9, 7}, {90, 28}}</string>
+																				<reference key="NSSuperview" ref="143420558"/>
+																				<reference key="NSNextKeyView" ref="986737125"/>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSButtonCell" key="NSCell" id="773749244">
+																					<int key="NSCellFlags">67239424</int>
+																					<int key="NSCellFlags2">138018816</int>
+																					<string key="NSContents">About</string>
+																					<reference key="NSSupport" ref="26"/>
+																					<reference key="NSControlView" ref="181214375"/>
+																					<int key="NSButtonFlags">-2038284033</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="694625424"/>
+																					<string key="NSAlternateContents"/>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">200</int>
+																					<int key="NSPeriodicInterval">25</int>
+																				</object>
+																			</object>
+																			<object class="NSPopUpButton" id="99318986">
+																				<reference key="NSNextResponder" ref="143420558"/>
+																				<int key="NSvFlags">258</int>
+																				<string key="NSFrame">{{11, 35}, {196, 26}}</string>
+																				<reference key="NSSuperview" ref="143420558"/>
+																				<reference key="NSNextKeyView" ref="181214375"/>
+																				<int key="NSTag">2</int>
+																				<bool key="NSEnabled">YES</bool>
+																				<object class="NSPopUpButtonCell" key="NSCell" id="52904758">
+																					<int key="NSCellFlags">-2076049856</int>
+																					<int key="NSCellFlags2">1024</int>
+																					<reference key="NSSupport" ref="113129670"/>
+																					<reference key="NSControlView" ref="99318986"/>
+																					<int key="NSButtonFlags">109199615</int>
+																					<int key="NSButtonFlags2">1</int>
+																					<reference key="NSAlternateImage" ref="983951697"/>
+																					<object class="NSMutableString" key="NSAlternateContents">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<object class="NSMutableString" key="NSKeyEquivalent">
+																						<characters key="NS.bytes"/>
+																					</object>
+																					<int key="NSPeriodicDelay">400</int>
+																					<int key="NSPeriodicInterval">75</int>
+																					<object class="NSMenuItem" key="NSMenuItem" id="1055625937">
+																						<reference key="NSMenu" ref="871032713"/>
+																						<string key="NSTitle">Net Plugin</string>
+																						<string key="NSKeyEquiv"/>
+																						<int key="NSKeyEquivModMask">1048576</int>
+																						<int key="NSMnemonicLoc">2147483647</int>
+																						<int key="NSState">1</int>
+																						<reference key="NSOnImage" ref="853204695"/>
+																						<reference key="NSMixedImage" ref="607321304"/>
+																						<string key="NSAction">_popUpItemAction:</string>
+																						<reference key="NSTarget" ref="52904758"/>
+																					</object>
+																					<bool key="NSMenuItemRespectAlignment">YES</bool>
+																					<object class="NSMenu" key="NSMenu" id="871032713">
+																						<object class="NSMutableString" key="NSTitle">
+																							<characters key="NS.bytes">OtherViews</characters>
+																						</object>
+																						<array class="NSMutableArray" key="NSMenuItems">
+																							<reference ref="1055625937"/>
+																						</array>
+																					</object>
+																					<int key="NSPreferredEdge">3</int>
+																					<bool key="NSUsesItemFromMenu">YES</bool>
+																					<bool key="NSAltersState">YES</bool>
+																					<int key="NSArrowPosition">1</int>
+																				</object>
+																			</object>
+																		</array>
+																		<string key="NSFrame">{{2, 2}, {218, 73}}</string>
+																		<reference key="NSSuperview" ref="950422833"/>
+																		<reference key="NSNextKeyView" ref="99318986"/>
+																	</object>
+																</array>
+																<string key="NSFrame">{{0, 12}, {222, 90}}</string>
+																<reference key="NSSuperview" ref="613304714"/>
+																<reference key="NSNextKeyView" ref="143420558"/>
+																<string key="NSOffsets">{0, 0}</string>
+																<object class="NSTextFieldCell" key="NSTitleCell">
+																	<int key="NSCellFlags">67239424</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Network</string>
+																	<reference key="NSSupport" ref="26"/>
+																	<reference key="NSBackgroundColor" ref="767300285"/>
+																	<object class="NSColor" key="NSTextColor">
+																		<int key="NSColorSpace">3</int>
+																		<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+																	</object>
+																</object>
+																<reference key="NSContentView" ref="143420558"/>
+																<int key="NSBorderType">3</int>
+																<int key="NSBoxType">0</int>
+																<int key="NSTitlePosition">2</int>
+																<bool key="NSTransparent">NO</bool>
+															</object>
 															<object class="NSBox" id="695086223">
 																<reference key="NSNextResponder" ref="613304714"/>
 																<int key="NSvFlags">267</int>
@@ -1122,7 +1270,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																				<int key="NSvFlags">259</int>
 																				<string key="NSFrame">{{98, 7}, {111, 28}}</string>
 																				<reference key="NSSuperview" ref="221272233"/>
-																				<reference key="NSNextKeyView" ref="145760790"/>
+																				<reference key="NSNextKeyView" ref="950422833"/>
 																				<bool key="NSEnabled">YES</bool>
 																				<object class="NSButtonCell" key="NSCell" id="350454119">
 																					<int key="NSCellFlags">67239424</int>
@@ -1223,7 +1371,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																		<reference key="NSNextKeyView" ref="169562785"/>
 																	</object>
 																</array>
-																<string key="NSFrame">{{249, 49}, {222, 90}}</string>
+																<string key="NSFrame">{{249, 106}, {222, 90}}</string>
 																<reference key="NSSuperview" ref="613304714"/>
 																<reference key="NSNextKeyView" ref="221272233"/>
 																<string key="NSOffsets">{0, 0}</string>
@@ -1245,12 +1393,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 																<bool key="NSTransparent">NO</bool>
 															</object>
 														</array>
-														<string key="NSFrameSize">{472, 236}</string>
+														<string key="NSFrameSize">{472, 293}</string>
 														<reference key="NSSuperview" ref="30192545"/>
 														<reference key="NSNextKeyView" ref="711664786"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{17, -33}, {472, 236}}</string>
+												<string key="NSFrame">{{17, 2}, {472, 293}}</string>
 												<reference key="NSSuperview" ref="494923943"/>
 												<reference key="NSNextKeyView" ref="613304714"/>
 												<string key="NSOffsets">{0, 0}</string>
@@ -1272,7 +1420,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<bool key="NSTransparent">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {506, 206}}</string>
+										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
 										<reference key="NSNextKeyView" ref="30192545"/>
 									</object>
 									<string key="NSLabel">Plugins</string>
@@ -1378,7 +1526,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														<reference key="NSNextKeyView" ref="368748693"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{8, 107}, {484, 99}}</string>
+												<string key="NSFrame">{{8, 199}, {484, 99}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
 												<reference key="NSNextKeyView" ref="126676794"/>
 												<string key="NSOffsets">{0, 0}</string>
@@ -1484,7 +1632,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 														<reference key="NSNextKeyView" ref="207334049"/>
 													</object>
 												</array>
-												<string key="NSFrame">{{8, 7}, {484, 96}}</string>
+												<string key="NSFrame">{{8, 99}, {484, 96}}</string>
 												<reference key="NSSuperview" ref="782866499"/>
 												<reference key="NSNextKeyView" ref="902969450"/>
 												<string key="NSOffsets">{0, 0}</string>
@@ -1506,7 +1654,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<bool key="NSTransparent">NO</bool>
 											</object>
 										</array>
-										<string key="NSFrame">{{10, 33}, {506, 206}}</string>
+										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
 										<reference key="NSNextKeyView" ref="834173564"/>
 									</object>
 									<string key="NSLabel">Memory Cards</string>
@@ -1524,14 +1672,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							</array>
 						</object>
 					</array>
-					<string key="NSFrameSize">{552, 268}</string>
+					<string key="NSFrameSize">{552, 360}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="145760790"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{552, 290}</string>
-				<string key="NSMaxSize">{2000, 290}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMinSize">{552, 382}</string>
+				<string key="NSMaxSize">{2000, 382}</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 			<object class="NSCustomObject" id="622912057">
@@ -1546,6 +1694,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 			<object class="NSCustomObject" id="778989052">
 				<string key="NSClassName">PluginController</string>
 			</object>
+			<object class="NSCustomObject" id="248585311">
+				<string key="NSClassName">PluginController</string>
+			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -1767,6 +1918,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
+						<string key="label">netPlugin</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="248585311"/>
+					</object>
+					<int key="connectionID">621</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">enableNetPlayCell</string>
+						<reference key="source" ref="974938689"/>
+						<reference key="destination" ref="322742106"/>
+					</object>
+					<int key="connectionID">641</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
 						<reference key="source" ref="379363543"/>
 						<reference key="destination" ref="974938689"/>
@@ -1965,6 +2132,54 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">398</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">aboutButton</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="181214375"/>
+					</object>
+					<int key="connectionID">634</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configureButton</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="986737125"/>
+					</object>
+					<int key="connectionID">635</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">pluginMenu</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="99318986"/>
+					</object>
+					<int key="connectionID">636</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">selectPlugin:</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="99318986"/>
+					</object>
+					<int key="connectionID">637</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doAbout:</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="181214375"/>
+					</object>
+					<int key="connectionID">638</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">doConfigure:</string>
+						<reference key="source" ref="248585311"/>
+						<reference key="destination" ref="986737125"/>
+					</object>
+					<int key="connectionID">639</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -2035,8 +2250,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<int key="objectID">502</int>
 						<reference key="object" ref="324328678"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="260387224"/>
 							<reference ref="197815183"/>
+							<reference ref="260387224"/>
 						</array>
 						<reference key="parent" ref="309207255"/>
 					</object>
@@ -2080,6 +2295,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="23337545"/>
 							<reference ref="490231628"/>
 							<reference ref="695086223"/>
+							<reference ref="950422833"/>
 						</array>
 						<reference key="parent" ref="494923943"/>
 					</object>
@@ -2159,6 +2375,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="323048264"/>
 							<reference ref="878205730"/>
 							<reference ref="1001969866"/>
+							<reference ref="322742106"/>
 						</array>
 						<reference key="parent" ref="324328678"/>
 					</object>
@@ -2628,6 +2845,82 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="405315818"/>
 						<reference key="parent" ref="194441705"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">620</int>
+						<reference key="object" ref="248585311"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Net Plugin</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">622</int>
+						<reference key="object" ref="950422833"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="99318986"/>
+							<reference ref="181214375"/>
+							<reference ref="986737125"/>
+						</array>
+						<reference key="parent" ref="30192545"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">623</int>
+						<reference key="object" ref="99318986"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="52904758"/>
+						</array>
+						<reference key="parent" ref="950422833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">624</int>
+						<reference key="object" ref="181214375"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="773749244"/>
+						</array>
+						<reference key="parent" ref="950422833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">625</int>
+						<reference key="object" ref="986737125"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="933521081"/>
+						</array>
+						<reference key="parent" ref="950422833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">626</int>
+						<reference key="object" ref="933521081"/>
+						<reference key="parent" ref="986737125"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">627</int>
+						<reference key="object" ref="773749244"/>
+						<reference key="parent" ref="181214375"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">628</int>
+						<reference key="object" ref="52904758"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="871032713"/>
+						</array>
+						<reference key="parent" ref="99318986"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">629</int>
+						<reference key="object" ref="871032713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1055625937"/>
+						</array>
+						<reference key="parent" ref="52904758"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">630</int>
+						<reference key="object" ref="1055625937"/>
+						<reference key="parent" ref="871032713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">640</int>
+						<reference key="object" ref="322742106"/>
+						<reference key="parent" ref="260387224"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -2771,12 +3064,23 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="617.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="618.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="619.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="620.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="622.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="623.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="624.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="625.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="626.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="627.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="628.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="629.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="630.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="640.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">619</int>
+			<int key="maxID">641</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2817,9 +3121,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<string key="bwMdecCell">id</string>
 						<string key="cdromPlugin">PluginController</string>
 						<string key="consoleOutputCell">id</string>
+						<string key="enableNetPlayCell">id</string>
 						<string key="graphicsPlugin">PluginController</string>
 						<string key="mcd1Label">NSTextField</string>
 						<string key="mcd2Label">NSTextField</string>
+						<string key="netPlugin">PluginController</string>
 						<string key="noCDAudioCell">id</string>
 						<string key="noFastBootCell">id</string>
 						<string key="noXaAudioCell">id</string>
@@ -2850,6 +3156,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">consoleOutputCell</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="enableNetPlayCell">
+							<string key="name">enableNetPlayCell</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="graphicsPlugin">
 							<string key="name">graphicsPlugin</string>
 							<string key="candidateClassName">PluginController</string>
@@ -2862,6 +3172,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">mcd2Label</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="netPlugin">
+							<string key="name">netPlugin</string>
+							<string key="candidateClassName">PluginController</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="noCDAudioCell">
 							<string key="name">noCDAudioCell</string>
 							<string key="candidateClassName">id</string>
@@ -2918,20 +3232,13 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PluginController</string>
-					<string key="superclassName">NSWindowController</string>
+					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="cancel:">id</string>
 						<string key="doAbout:">id</string>
 						<string key="doConfigure:">id</string>
-						<string key="ok:">id</string>
-						<string key="reset:">id</string>
 						<string key="selectPlugin:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="cancel:">
-							<string key="name">cancel:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="doAbout:">
 							<string key="name">doAbout:</string>
 							<string key="candidateClassName">id</string>
@@ -2940,14 +3247,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">doConfigure:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="ok:">
-							<string key="name">ok:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="reset:">
-							<string key="name">reset:</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBActionInfo" key="selectPlugin:">
 							<string key="name">selectPlugin:</string>
 							<string key="candidateClassName">id</string>
@@ -2956,15 +3255,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="aboutButton">NSButton</string>
 						<string key="configureButton">NSButton</string>
-						<string key="hiCompBox">NSControl</string>
-						<string key="interpolValue">NetSfPeopsSPUPluginNamedSlider</string>
-						<string key="irqWaitBox">NSControl</string>
-						<string key="monoSoundBox">NSControl</string>
 						<string key="pluginMenu">NSPopUpButton</string>
-						<string key="reverbValue">NetSfPeopsSPUPluginNamedSlider</string>
-						<string key="volumeValue">NetSfPeopsSPUPluginNamedSlider</string>
-						<string key="xaEnableBox">NSControl</string>
-						<string key="xaSpeedBox">NSControl</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<object class="IBToOneOutletInfo" key="aboutButton">
@@ -2975,42 +3266,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">configureButton</string>
 							<string key="candidateClassName">NSButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="hiCompBox">
-							<string key="name">hiCompBox</string>
-							<string key="candidateClassName">NSControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="interpolValue">
-							<string key="name">interpolValue</string>
-							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="irqWaitBox">
-							<string key="name">irqWaitBox</string>
-							<string key="candidateClassName">NSControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="monoSoundBox">
-							<string key="name">monoSoundBox</string>
-							<string key="candidateClassName">NSControl</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="pluginMenu">
 							<string key="name">pluginMenu</string>
 							<string key="candidateClassName">NSPopUpButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="reverbValue">
-							<string key="name">reverbValue</string>
-							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="volumeValue">
-							<string key="name">volumeValue</string>
-							<string key="candidateClassName">NetSfPeopsSPUPluginNamedSlider</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="xaEnableBox">
-							<string key="name">xaEnableBox</string>
-							<string key="candidateClassName">NSControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="xaSpeedBox">
-							<string key="name">xaSpeedBox</string>
-							<string key="candidateClassName">NSControl</string>
-						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
diff --git a/macosx/Pcsxr.xcodeproj/project.pbxproj b/macosx/Pcsxr.xcodeproj/project.pbxproj
index 03c566c0..c5b8b4de 100644
--- a/macosx/Pcsxr.xcodeproj/project.pbxproj
+++ b/macosx/Pcsxr.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C712B694DF004ACC1E /* ix86_mmx.c */; };
 		559366D012B694DF004ACC1E /* ix86_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C812B694DF004ACC1E /* ix86_sse.c */; };
 		559DAC47146BA61F00C5DF71 /* PeopsAL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 28B467F11463D0020083F129 /* PeopsAL.psxplugin */; };
+		559DACBB146C68C500C5DF71 /* DFNet.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 559DACAE146C647E00C5DF71 /* DFNet.psxplugin */; };
 		559DACEE146C72FF00C5DF71 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 559DACEC146C72FF00C5DF71 /* Localizable.strings */; };
 		712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
 		712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
@@ -112,6 +113,20 @@
 			remoteGlobalIDString = 5599693613AFCD2900B0216B;
 			remoteInfo = PeopsAL;
 		};
+		559DACAD146C647E00C5DF71 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8D576316048677EA00EA77CD;
+			remoteInfo = DFNet;
+		};
+		559DACB9146C68B700C5DF71 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 8D57630D048677EA00EA77CD;
+			remoteInfo = DFNet;
+		};
 		713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
@@ -191,6 +206,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 13;
 			files = (
+				559DACBB146C68C500C5DF71 /* DFNet.psxplugin in Copy PlugIns */,
 				559DAC47146BA61F00C5DF71 /* PeopsAL.psxplugin in Copy PlugIns */,
 				71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */,
 				71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */,
@@ -256,6 +272,7 @@
 		559366C612B694DF004ACC1E /* ix86_fpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_fpu.c; sourceTree = "<group>"; };
 		559366C712B694DF004ACC1E /* ix86_mmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_mmx.c; sourceTree = "<group>"; };
 		559366C812B694DF004ACC1E /* ix86_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_sse.c; sourceTree = "<group>"; };
+		559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFNet.xcodeproj; path = plugins/DFNet/DFNet.xcodeproj; sourceTree = "<group>"; };
 		559DACED146C72FF00C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = Localizable.strings; sourceTree = "<group>"; };
 		712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = "<group>"; };
 		712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
@@ -408,6 +425,7 @@
 		2BBD6C1D04C893F500A83E33 /* PlugIns */ = {
 			isa = PBXGroup;
 			children = (
+				559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */,
 				71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */,
 				71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */,
 				71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */,
@@ -537,6 +555,14 @@
 			path = ix86_64;
 			sourceTree = "<group>";
 		};
+		559DACA4146C647E00C5DF71 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				559DACAE146C647E00C5DF71 /* DFNet.psxplugin */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		71AD2DCD10C356FD00365243 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -606,6 +632,7 @@
 				2BB3D6D005427FE200831ACB /* PBXBuildRule */,
 			);
 			dependencies = (
+				559DACBA146C68B700C5DF71 /* PBXTargetDependency */,
 				559DAC46146BA61400C5DF71 /* PBXTargetDependency */,
 				71AD2DE910C3572200365243 /* PBXTargetDependency */,
 				71AD2DEB10C3572500365243 /* PBXTargetDependency */,
@@ -649,6 +676,10 @@
 					ProjectRef = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
 				},
 				{
+					ProductGroup = 559DACA4146C647E00C5DF71 /* Products */;
+					ProjectRef = 559DACA3146C647E00C5DF71 /* DFNet.xcodeproj */;
+				},
+				{
 					ProductGroup = 71AD2DD810C3570900365243 /* Products */;
 					ProjectRef = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
 				},
@@ -676,6 +707,13 @@
 			remoteRef = 28B467F01463D0020083F129 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		559DACAE146C647E00C5DF71 /* DFNet.psxplugin */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = DFNet.psxplugin;
+			remoteRef = 559DACAD146C647E00C5DF71 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
@@ -795,6 +833,11 @@
 			name = PeopsAL;
 			targetProxy = 559DAC45146BA61400C5DF71 /* PBXContainerItemProxy */;
 		};
+		559DACBA146C68B700C5DF71 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = DFNet;
+			targetProxy = 559DACB9146C68B700C5DF71 /* PBXContainerItemProxy */;
+		};
 		713CB2DE11FC49720033B6A8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = DFCdrom;
diff --git a/macosx/PcsxrController.m b/macosx/PcsxrController.m
index bfa9b0be..aaf0f2ef 100644
--- a/macosx/PcsxrController.m
+++ b/macosx/PcsxrController.m
@@ -276,8 +276,11 @@ NSString *saveStatePath;
 		else strcpy(Config.Bios, "HLE");
 	}
 
-	// FIXME: hack
-	strcpy(Config.Net, "Disabled");
+	str = [[defaults stringForKey:@"Net"] fileSystemRepresentation];
+	if (str) strncpy(Config.Net, str, MAXPATHLEN);
+	else {
+			strcpy(Config.Net, "Disabled");
+	}
 }
 
 + (void)setDefaultFromConfig:(NSString *)defaultKey
@@ -309,7 +312,6 @@ NSString *saveStatePath;
 	const char *str;
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
-		@"Disabled", @"PluginNET",
 		[NSNumber numberWithInt:1], @"NoDynarec",
 		[NSNumber numberWithInt:1], @"AutoDetectVideoType",
 		[NSNumber numberWithInt:0], @"UseHLE",
@@ -329,6 +331,7 @@ NSString *saveStatePath;
 
 	prefByteKeys = [[NSDictionary alloc] initWithObjectsAndKeys:
 		[NSValue valueWithPointer:&Config.Xa], @"NoXaAudio",
+		[NSValue valueWithPointer:&Config.UseNet], @"NetPlay",
 		[NSValue valueWithPointer:&Config.Sio], @"SioIrqAlways",
 		[NSValue valueWithPointer:&Config.Mdec], @"BlackAndWhiteMDECVideo",
 		[NSValue valueWithPointer:&Config.PsxAuto], @"AutoDetectVideoType",
diff --git a/macosx/Plugin.c b/macosx/Plugin.c
index 5bcf7229..9d1a8d0e 100644
--- a/macosx/Plugin.c
+++ b/macosx/Plugin.c
@@ -90,6 +90,62 @@ int _OpenPlugins() {
     PAD2_registerVibration(GPU_visualVibration);
     PAD2_registerCursor(GPU_cursor);
 
+	if (Config.UseNet && !NetOpened) {
+		netInfo info;
+		char path[MAXPATHLEN];
+		
+		strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+		strncpy(info.CdromID, CdromId, 9);
+		strncpy(info.CdromLabel, CdromLabel, 9);
+		info.psxMem = psxM;
+		info.GPU_showScreenPic = GPU_showScreenPic;
+		info.GPU_displayText = GPU_displayText;
+		info.GPU_showScreenPic = GPU_showScreenPic;
+		info.PAD_setSensitive = PAD1_setSensitive;
+		sprintf(path, "%s%s", Config.BiosDir, Config.Bios);
+		strcpy(info.BIOSpath, path);
+		strcpy(info.MCD1path, Config.Mcd1);
+		strcpy(info.MCD2path, Config.Mcd2);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Gpu);
+		strcpy(info.GPUpath, path);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Spu);
+		strcpy(info.SPUpath, path);
+		sprintf(path, "%s%s", Config.PluginsDir, Config.Cdr);
+		strcpy(info.CDRpath, path);
+		NET_setInfo(&info);
+		
+		ret = NET_open(&gpuDisp);
+		if (ret < 0) {
+			if (ret == -2) {
+				// -2 is returned when something in the info
+				// changed and needs to be synced
+				char *ptr;
+				
+				PARSEPATH(Config.Bios, info.BIOSpath);
+				PARSEPATH(Config.Gpu,  info.GPUpath);
+				PARSEPATH(Config.Spu,  info.SPUpath);
+				PARSEPATH(Config.Cdr,  info.CDRpath);
+				
+				strcpy(Config.Mcd1, info.MCD1path);
+				strcpy(Config.Mcd2, info.MCD2path);
+				return -2;
+			} else {
+				Config.UseNet = FALSE;
+			}
+		} else {
+			
+			if (NET_queryPlayer() == 1) {
+				if (SendPcsxInfo() == -1) Config.UseNet = FALSE;
+			} else {
+				if (RecvPcsxInfo() == -1) Config.UseNet = FALSE;
+			}
+			
+		}
+		NetOpened = TRUE;
+	} else if (Config.UseNet) {
+		NET_resume();
+	}
+	
 	return 0;
 }
 
@@ -119,6 +175,10 @@ void ClosePlugins() {
 	if (ret < 0) { SysMessage(_("Error Closing PAD2 Plugin")); return; }
 	ret = GPU_close();
 	if (ret < 0) { SysMessage(_("Error Closing GPU Plugin")); return; }
+
+	if (Config.UseNet) {
+		NET_pause();
+	}
 }
 
 void ResetPlugins() {
@@ -129,7 +189,8 @@ void ResetPlugins() {
 	SPU_shutdown();
 	PAD1_shutdown();
 	PAD2_shutdown();
-
+	if (Config.UseNet) NET_shutdown();
+	
 	ret = CDR_init();
 	if (ret < 0) { SysMessage(_("CDRinit error: %d"), ret); return; }
 	ret = GPU_init();
@@ -140,6 +201,10 @@ void ResetPlugins() {
 	if (ret < 0) { SysMessage(_("PAD1init error: %d"), ret); return; }
 	ret = PAD2_init(2);
 	if (ret < 0) { SysMessage(_("PAD2init error: %d"), ret); return; }
+	if (Config.UseNet) {
+		ret = NET_init();
+		if (ret < 0) { SysMessage(_("NETinit error: %d"), ret); return; }
+	}
 
 	NetOpened = FALSE;
 }
diff --git a/macosx/PluginList.h b/macosx/PluginList.h
index 1f5fc890..51ba5066 100644
--- a/macosx/PluginList.h
+++ b/macosx/PluginList.h
@@ -16,12 +16,13 @@
     @private
     NSMutableArray *pluginList;
 	 
-	 PcsxrPlugin *activeGpuPlugin;
-	 PcsxrPlugin *activeSpuPlugin;
-	 PcsxrPlugin *activeCdrPlugin;
-	 PcsxrPlugin *activePadPlugin;
+	PcsxrPlugin *activeGpuPlugin;
+	PcsxrPlugin *activeSpuPlugin;
+	PcsxrPlugin *activeCdrPlugin;
+	PcsxrPlugin *activePadPlugin;
+	PcsxrPlugin *activeNetPlugin;
 	 
-	 BOOL missingPlugins;
+	BOOL missingPlugins;
 }
 
 + (PluginList *)list;
diff --git a/macosx/PluginList.m b/macosx/PluginList.m
index f3d5a449..b5b61b5c 100644
--- a/macosx/PluginList.m
+++ b/macosx/PluginList.m
@@ -14,7 +14,7 @@
 
 //NSMutableArray *plugins;
 static PluginList *sPluginList = nil;
-const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
+const static int typeList[5] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD, PSE_LT_NET};
 
 @implementation PluginList
 
@@ -98,7 +98,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
 	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
 	pluginList = [[NSMutableArray alloc] initWithCapacity:20];
 
-	activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = nil;
+	activeGpuPlugin = activeSpuPlugin = activeCdrPlugin = activePadPlugin = activeNetPlugin = nil;
 	
 	missingPlugins = NO;
 	for (i = 0; i < sizeof(*typeList); i++) {
@@ -137,6 +137,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
 	[activeSpuPlugin release];
 	[activeCdrPlugin release];
 	[activePadPlugin release];
+	[activeNetPlugin release];
 	
 	[pluginList release];
 	
@@ -240,6 +241,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
 	if ([activeSpuPlugin initAs:PSE_LT_SPU] != 0) bad = YES;
 	if ([activeCdrPlugin initAs:PSE_LT_CDR] != 0) bad = YES;
 	if ([activePadPlugin initAs:PSE_LT_PAD] != 0) bad = YES;
+	if ([activeNetPlugin initAs:PSE_LT_NET] != 0) bad = YES;
 	
 	return !bad;
 }
@@ -251,7 +253,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
 		case PSE_LT_CDR: return activeCdrPlugin;
 		case PSE_LT_SPU: return activeSpuPlugin;
 		case PSE_LT_PAD: return activePadPlugin;
-//		case PSE_LT_NET: return activeNetPlugin;
+		case PSE_LT_NET: return activeNetPlugin;
 	}
 	
 	return nil;
@@ -265,7 +267,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
 		case PSE_LT_CDR: pluginPtr = &activeCdrPlugin; break;
 		case PSE_LT_SPU: pluginPtr = &activeSpuPlugin; break;
 		case PSE_LT_PAD: pluginPtr = &activePadPlugin; break;
-//		case PSE_LT_NET: pluginPtr = &activeNetPlugin; break;
+		case PSE_LT_NET: pluginPtr = &activeNetPlugin; break;
 		default: return NO;
 	}
 	
diff --git a/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj b/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj
new file mode 100755
index 00000000..bddb0aff
--- /dev/null
+++ b/macosx/plugins/DFNet/DFNet.xcodeproj/project.pbxproj
@@ -0,0 +1,388 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		551ED70C130F209C00D19D11 /* SockDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 551ED70A130F209C00D19D11 /* SockDialog.h */; };
+		551ED70D130F209C00D19D11 /* SockDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 551ED70B130F209C00D19D11 /* SockDialog.m */; };
+		55278DBD12C813AC00288CD8 /* dfnet.c in Sources */ = {isa = PBXBuildFile; fileRef = 55278DBA12C813AC00288CD8 /* dfnet.c */; };
+		55278DBE12C813AC00288CD8 /* dfnet.h in Headers */ = {isa = PBXBuildFile; fileRef = 55278DBB12C813AC00288CD8 /* dfnet.h */; };
+		55278DC212C8141600288CD8 /* cfg.c in Sources */ = {isa = PBXBuildFile; fileRef = 55278DC112C8141600288CD8 /* cfg.c */; };
+		55612EC912C965F500BD3D17 /* unix.c in Sources */ = {isa = PBXBuildFile; fileRef = 55278DBC12C813AC00288CD8 /* unix.c */; };
+		559DACB3146C64B800C5DF71 /* DFNet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 559DACB1146C64B800C5DF71 /* DFNet.xib */; };
+		559DACB8146C64D600C5DF71 /* SockDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 559DACB6146C64D600C5DF71 /* SockDialog.xib */; };
+		55F79D6C1475B252007C856E /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 55F79D6E1475B252007C856E /* Localizable.strings */; };
+		71F3C32A11F3CD0B007B9F12 /* PluginConfigController.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */; };
+		71F3C32B11F3CD0B007B9F12 /* PluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */; };
+		71F3C38611F3CFED007B9F12 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 71F3C38511F3CFED007B9F12 /* AppKit.framework */; };
+		71F3C47A11F3D108007B9F12 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 71F3C47811F3D108007B9F12 /* Credits.rtf */; };
+		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
+		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		551ED70A130F209C00D19D11 /* SockDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SockDialog.h; sourceTree = "<group>"; };
+		551ED70B130F209C00D19D11 /* SockDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SockDialog.m; sourceTree = "<group>"; };
+		55278DBA12C813AC00288CD8 /* dfnet.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dfnet.c; path = ../../../plugins/dfnet/dfnet.c; sourceTree = SOURCE_ROOT; };
+		55278DBB12C813AC00288CD8 /* dfnet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dfnet.h; path = ../../../plugins/dfnet/dfnet.h; sourceTree = SOURCE_ROOT; };
+		55278DBC12C813AC00288CD8 /* unix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = unix.c; path = ../../../plugins/dfnet/unix.c; sourceTree = SOURCE_ROOT; };
+		55278DC112C8141600288CD8 /* cfg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cfg.c; sourceTree = "<group>"; };
+		559DACB2146C64B800C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = plugins/DFNet/English.lproj/DFNet.xib; sourceTree = "<group>"; };
+		559DACB7146C64D600C5DF71 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = plugins/DFNet/English.lproj/SockDialog.xib; sourceTree = "<group>"; };
+		55F79D6D1475B252007C856E /* English */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
+		71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = PluginConfigController.h; sourceTree = "<group>"; };
+		71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; path = PluginConfigController.m; sourceTree = "<group>"; };
+		71F3C38511F3CFED007B9F12 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		71F3C38711F3CFF7007B9F12 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		71F3C47911F3D108007B9F12 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		8D576316048677EA00EA77CD /* DFNet.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFNet.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D576313048677EA00EA77CD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
+				71F3C38611F3CFED007B9F12 /* AppKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		089C166AFE841209C02AAC07 /* CdrDevMac */ = {
+			isa = PBXGroup;
+			children = (
+				08FB77AFFE84173DC02AAC07 /* Source Files */,
+				089C167CFE841241C02AAC07 /* Resources */,
+				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+				19C28FB6FE9D52B211CA2CBB /* Products */,
+			);
+			name = CdrDevMac;
+			sourceTree = "<group>";
+		};
+		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				71F3C38511F3CFED007B9F12 /* AppKit.framework */,
+				71F3C38711F3CFF7007B9F12 /* Carbon.framework */,
+				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		089C167CFE841241C02AAC07 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				559DACB1146C64B800C5DF71 /* DFNet.xib */,
+				71F3C47811F3D108007B9F12 /* Credits.rtf */,
+				8D576317048677EA00EA77CD /* Info.plist */,
+				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
+				55F79D6E1475B252007C856E /* Localizable.strings */,
+				559DACB6146C64D600C5DF71 /* SockDialog.xib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		08FB77AFFE84173DC02AAC07 /* Source Files */ = {
+			isa = PBXGroup;
+			children = (
+				71F3C32111F3CCEF007B9F12 /* macsrc */,
+				71F3C30911F3CC22007B9F12 /* src */,
+			);
+			name = "Source Files";
+			sourceTree = "<group>";
+		};
+		19C28FB6FE9D52B211CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D576316048677EA00EA77CD /* DFNet.psxplugin */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		71F3C30911F3CC22007B9F12 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				55278DBA12C813AC00288CD8 /* dfnet.c */,
+				55278DBB12C813AC00288CD8 /* dfnet.h */,
+				55278DBC12C813AC00288CD8 /* unix.c */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
+		71F3C32111F3CCEF007B9F12 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				55278DC112C8141600288CD8 /* cfg.c */,
+				71F3C32611F3CD0B007B9F12 /* PluginConfigController.h */,
+				71F3C32711F3CD0B007B9F12 /* PluginConfigController.m */,
+				551ED70A130F209C00D19D11 /* SockDialog.h */,
+				551ED70B130F209C00D19D11 /* SockDialog.m */,
+			);
+			path = macsrc;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8D57630E048677EA00EA77CD /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				71F3C32A11F3CD0B007B9F12 /* PluginConfigController.h in Headers */,
+				55278DBE12C813AC00288CD8 /* dfnet.h in Headers */,
+				551ED70C130F209C00D19D11 /* SockDialog.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		8D57630D048677EA00EA77CD /* DFNet */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 710735990FDEED75004AD098 /* Build configuration list for PBXNativeTarget "DFNet" */;
+			buildPhases = (
+				8D57630E048677EA00EA77CD /* Headers */,
+				8D57630F048677EA00EA77CD /* Resources */,
+				8D576311048677EA00EA77CD /* Sources */,
+				8D576313048677EA00EA77CD /* Frameworks */,
+				8D576315048677EA00EA77CD /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = DFNet;
+			productInstallPath = "$(HOME)/Library/Bundles";
+			productName = CdrDevMac;
+			productReference = 8D576316048677EA00EA77CD /* DFNet.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		089C1669FE841209C02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFNet" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 089C166AFE841209C02AAC07 /* CdrDevMac */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D57630D048677EA00EA77CD /* DFNet */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D57630F048677EA00EA77CD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
+				71F3C47A11F3D108007B9F12 /* Credits.rtf in Resources */,
+				559DACB3146C64B800C5DF71 /* DFNet.xib in Resources */,
+				559DACB8146C64D600C5DF71 /* SockDialog.xib in Resources */,
+				55F79D6C1475B252007C856E /* Localizable.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		8D576315048677EA00EA77CD /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D576311048677EA00EA77CD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				71F3C32B11F3CD0B007B9F12 /* PluginConfigController.m in Sources */,
+				55278DBD12C813AC00288CD8 /* dfnet.c in Sources */,
+				55278DC212C8141600288CD8 /* cfg.c in Sources */,
+				55612EC912C965F500BD3D17 /* unix.c in Sources */,
+				551ED70D130F209C00D19D11 /* SockDialog.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		559DACB1146C64B800C5DF71 /* DFNet.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				559DACB2146C64B800C5DF71 /* English */,
+			);
+			name = DFNet.xib;
+			path = ../..;
+			sourceTree = "<group>";
+		};
+		559DACB6146C64D600C5DF71 /* SockDialog.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				559DACB7146C64D600C5DF71 /* English */,
+			);
+			name = SockDialog.xib;
+			path = ../..;
+			sourceTree = "<group>";
+		};
+		55F79D6E1475B252007C856E /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				55F79D6D1475B252007C856E /* English */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		71F3C47811F3D108007B9F12 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				71F3C47911F3D108007B9F12 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C167EFE841241C02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		7107359A0FDEED75004AD098 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFNet",
+					"_MACOSX=1",
+				);
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_LDFLAGS = "";
+				PRODUCT_NAME = DFNet;
+				SECTORDER_FLAGS = "";
+				SYMROOT = ../../build;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Debug;
+		};
+		7107359B0FDEED75004AD098 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_OPTIMIZATION_LEVEL = s;
+				GCC_PRECOMPILE_PREFIX_HEADER = NO;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"PCSXRPLUG=DFNet",
+					"_MACOSX=1",
+				);
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				OTHER_LDFLAGS = "";
+				PRODUCT_NAME = DFNet;
+				SECTORDER_FLAGS = "";
+				SYMROOT = ../../build;
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Release;
+		};
+		7107359F0FDEED75004AD098 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
+				HEADER_SEARCH_PATHS = (
+					../../../libpcsxcore,
+					../..,
+					../../../plugins/dfnet,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+				STRIP_INSTALLED_PRODUCT = NO;
+			};
+			name = Debug;
+		};
+		710735A00FDEED75004AD098 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
+				GCC_PREPROCESSOR_DEFINITIONS = "_MACOSX=1";
+				HEADER_SEARCH_PATHS = (
+					../../../libpcsxcore,
+					../..,
+					../../../plugins/dfnet,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.6.sdk";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		710735990FDEED75004AD098 /* Build configuration list for PBXNativeTarget "DFNet" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7107359A0FDEED75004AD098 /* Debug */,
+				7107359B0FDEED75004AD098 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7107359E0FDEED75004AD098 /* Build configuration list for PBXProject "DFNet" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7107359F0FDEED75004AD098 /* Debug */,
+				710735A00FDEED75004AD098 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
diff --git a/macosx/plugins/DFNet/English.lproj/Credits.rtf b/macosx/plugins/DFNet/English.lproj/Credits.rtf
new file mode 100644
index 00000000..fef26c23
--- /dev/null
+++ b/macosx/plugins/DFNet/English.lproj/Credits.rtf
@@ -0,0 +1,13 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
+
+\f0\b\fs24 \cf0 Original coder:
+\b0 \
+  linuzappz\
+\
+
+\b Macintosh Port:
+\b0 \
+  C.W. "Madd the Sane" Betts}
\ No newline at end of file
diff --git a/macosx/plugins/DFNet/English.lproj/DFNet.xib b/macosx/plugins/DFNet/English.lproj/DFNet.xib
new file mode 100644
index 00000000..5fddbcca
--- /dev/null
+++ b/macosx/plugins/DFNet/English.lproj/DFNet.xib
@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">1938</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSTextField</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSTextFieldCell</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSCustomObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">DFNetPlayPluginConfigController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {372, 270}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">Settings</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSButton" id="199511368">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{262, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="77267016">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Okay</string>
+								<object class="NSFont" key="NSSupport" id="638482190">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="199511368"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="898087221">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{126, 228}, {96, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="642817145">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">127.0.0.1</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="898087221"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<object class="NSColor" key="NSBackgroundColor" id="14663110">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="202277391">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textColor</string>
+									<object class="NSColor" key="NSColor" id="922126131">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSButton" id="691737833">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{154, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="124429728">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="691737833"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="241801086">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{126, 198}, {96, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="994761013">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">33306</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="241801086"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="14663110"/>
+								<reference key="NSTextColor" ref="202277391"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="300903308">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 230}, {75, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="871000838">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">IP Address:</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="300903308"/>
+								<object class="NSColor" key="NSBackgroundColor" id="865466005">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="2780984">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<reference key="NSColor" ref="922126131"/>
+								</object>
+							</object>
+						</object>
+						<object class="NSTextField" id="578306678">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 200}, {38, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="820109644">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Port:</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="578306678"/>
+								<reference key="NSBackgroundColor" ref="865466005"/>
+								<reference key="NSTextColor" ref="2780984"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="762877023">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 170}, {101, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="295724552">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">Player Number:</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="762877023"/>
+								<reference key="NSBackgroundColor" ref="865466005"/>
+								<reference key="NSTextColor" ref="2780984"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="975640728">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{126, 168}, {96, 22}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="123591098">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents">1</string>
+								<reference key="NSSupport" ref="638482190"/>
+								<reference key="NSControlView" ref="975640728"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="14663110"/>
+								<reference key="NSTextColor" ref="202277391"/>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{372, 270}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="199511368"/>
+					</object>
+					<int key="connectionID">8</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="691737833"/>
+					</object>
+					<int key="connectionID">15</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">ipAddress</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="898087221"/>
+					</object>
+					<int key="connectionID">16</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">portNum</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="241801086"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">playerNum</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="975640728"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="199511368"/>
+							<reference ref="300903308"/>
+							<reference ref="762877023"/>
+							<reference ref="578306678"/>
+							<reference ref="898087221"/>
+							<reference ref="241801086"/>
+							<reference ref="975640728"/>
+							<reference ref="691737833"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="199511368"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="77267016"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="77267016"/>
+						<reference key="parent" ref="199511368"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="898087221"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="642817145"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="642817145"/>
+						<reference key="parent" ref="898087221"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="691737833"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="124429728"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="124429728"/>
+						<reference key="parent" ref="691737833"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="241801086"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="994761013"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="994761013"/>
+						<reference key="parent" ref="241801086"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="300903308"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="871000838"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="871000838"/>
+						<reference key="parent" ref="300903308"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="578306678"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="820109644"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="820109644"/>
+						<reference key="parent" ref="578306678"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="762877023"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="295724552"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="295724552"/>
+						<reference key="parent" ref="762877023"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="975640728"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="123591098"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="123591098"/>
+						<reference key="parent" ref="975640728"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{577, 640}, {372, 270}}</string>
+				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<array class="NSMutableArray" key="2.IBUserGuides">
+					<object class="IBUserGuide">
+						<reference key="view" ref="1006"/>
+						<double key="location">126</double>
+						<int key="affinity">0</int>
+					</object>
+				</array>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">28</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">DFNetPlayPluginConfigController</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="ipAddress">NSTextField</string>
+						<string key="playerNum">NSTextField</string>
+						<string key="portNum">NSTextField</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="ipAddress">
+							<string key="name">ipAddress</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="playerNum">
+							<string key="name">playerNum</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="portNum">
+							<string key="name">portNum</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DFNetPlayPluginConfigController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>
diff --git a/macosx/plugins/DFNet/English.lproj/InfoPlist.strings b/macosx/plugins/DFNet/English.lproj/InfoPlist.strings
new file mode 100755
index 00000000..cf210c17
--- /dev/null
+++ b/macosx/plugins/DFNet/English.lproj/InfoPlist.strings
diff --git a/macosx/plugins/DFNet/English.lproj/Localizable.strings b/macosx/plugins/DFNet/English.lproj/Localizable.strings
new file mode 100644
index 00000000..c42ce723
--- /dev/null
+++ b/macosx/plugins/DFNet/English.lproj/Localizable.strings
@@ -0,0 +1,11 @@
+/* 
+ Localizable.strings
+ DFNet
+ 
+ Created by C.W. Betts on 11/17/11.
+ Copyright 2011 __MyCompanyName__. All rights reserved.
+ */
+
+"Error allocating memory!\n" = "Error allocating memory!\n";
+"error connecting to %s: %s\n" = "error connecting to %s: %s\n";
+"Socket Driver" = "Socket Driver";
diff --git a/macosx/plugins/DFNet/English.lproj/SockDialog.xib b/macosx/plugins/DFNet/English.lproj/SockDialog.xib
new file mode 100644
index 00000000..d3d98dd5
--- /dev/null
+++ b/macosx/plugins/DFNet/English.lproj/SockDialog.xib
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11C74</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
+		<string key="IBDocument.AppKitVersion">1138.23</string>
+		<string key="IBDocument.HIToolboxVersion">567.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">1938</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSTextField</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSProgressIndicator</string>
+			<string>NSCustomObject</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSTextFieldCell</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">SockDialog</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 371}, {382, 139}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">Window</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTextField" id="150785340">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 102}, {348, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="993388181">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">138413056</int>
+								<string key="NSContents">Waiting for connections...</string>
+								<object class="NSFont" key="NSSupport" id="596705607">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="150785340"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSProgressIndicator" id="308883112">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">1292</int>
+							<object class="NSPSMatrix" key="NSDrawMatrix"/>
+							<string key="NSFrame">{{104, 61}, {174, 20}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<int key="NSpiFlags">16394</int>
+							<double key="NSMaxValue">100</double>
+						</object>
+						<object class="NSButton" id="105187407">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{143, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="857910789">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="596705607"/>
+								<reference key="NSControlView" ref="105187407"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{382, 139}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">9</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="105187407"/>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="150785340"/>
+							<reference ref="308883112"/>
+							<reference ref="105187407"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="150785340"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="993388181"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="993388181"/>
+						<reference key="parent" ref="150785340"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="308883112"/>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="105187407"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="857910789"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="857910789"/>
+						<reference key="parent" ref="105187407"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{322, 765}, {382, 139}}</string>
+				<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">10</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">SockDialog</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">cancel:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">cancel:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/SockDialog.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>
diff --git a/macosx/plugins/DFNet/Info.plist b/macosx/plugins/DFNet/Info.plist
new file mode 100644
index 00000000..8a57e31f
--- /dev/null
+++ b/macosx/plugins/DFNet/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>net.codeplex.pcsxr.DFNet</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>PsxP</string>
+	<key>CFBundleSignature</key>
+	<string>CdDI</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSPrincipalClass</key>
+	<string>DFNetPlayPluginConfigController</string>
+</dict>
+</plist>
diff --git a/macosx/plugins/DFNet/macsrc/PluginConfigController.h b/macosx/plugins/DFNet/macsrc/PluginConfigController.h
new file mode 100644
index 00000000..f0986e76
--- /dev/null
+++ b/macosx/plugins/DFNet/macsrc/PluginConfigController.h
@@ -0,0 +1,16 @@
+#define PluginConfigController DFNetPlayPluginConfigController
+
+#import <Cocoa/Cocoa.h>
+
+@interface PluginConfigController : NSWindowController
+{
+	IBOutlet NSTextField *ipAddress;
+	IBOutlet NSTextField *portNum;
+	IBOutlet NSTextField *playerNum;
+}
+- (IBAction)cancel:(id)sender;
+- (IBAction)ok:(id)sender;
+
+- (void)loadValues;
+
+@end
diff --git a/macosx/plugins/DFNet/macsrc/PluginConfigController.m b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
new file mode 100644
index 00000000..39ff984f
--- /dev/null
+++ b/macosx/plugins/DFNet/macsrc/PluginConfigController.m
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2010, Wei Mingzhi <whistler@openoffice.org>.
+ * All Rights Reserved.
+ *
+ * Based on: Cdrom for Psemu Pro like Emulators
+ * By: linuzappz <linuzappz@hotmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
+ */
+
+#import "PluginConfigController.h"
+#include "dfnet.h"
+
+#define kIPADDRKEY @"IP Address"
+#define kIPPORT @"IP Port"
+#define kPLAYERNUM @"Player Number"
+
+#define APP_ID @"net.codeplex.pcsxr.DFNet"
+#define PrefsKey APP_ID @" Settings"
+
+static PluginConfigController *windowController;
+
+void AboutDlgProc()
+{
+	// Get parent application instance
+	NSApplication *app = [NSApplication sharedApplication];
+	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
+
+	// Get Credits.rtf
+	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
+	NSAttributedString *credits;
+	if (path) {
+		credits = [[[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL] autorelease];
+	} else {
+		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+	}
+
+	// Get Application Icon
+	NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
+	[icon setSize:NSMakeSize(64, 64)];
+
+	[app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys:
+			[bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+			icon, @"ApplicationIcon",
+			[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+			[bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+			[bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+			credits, @"Credits",
+			nil]];
+}
+
+void ConfDlgProc()
+{
+	NSWindow *window;
+
+	if (windowController == nil) {
+		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"DFNet"];
+	}
+	window = [windowController window];
+
+	[windowController loadValues];
+
+	[window center];
+	[window makeKeyAndOrderFront:nil];
+}
+
+void ReadConfig()
+{
+	NSDictionary *keyValues;
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	[defaults registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+								[NSMutableDictionary dictionaryWithObjectsAndKeys:
+								 @"127.0.0.1",kIPADDRKEY,
+								 [NSNumber numberWithInt:33306], kIPPORT,
+								 [NSNumber numberWithInt:1], kPLAYERNUM,
+								 nil], PrefsKey, nil]];
+	
+	keyValues = [defaults dictionaryForKey:PrefsKey];
+
+	conf.PortNum = [[keyValues objectForKey:kIPPORT] intValue];
+	conf.PlayerNum = [[keyValues objectForKey:kPLAYERNUM] intValue];
+	strcpy(conf.ipAddress, [[keyValues objectForKey:kIPADDRKEY] cString]);
+}
+
+@implementation PluginConfigController
+
+- (IBAction)cancel:(id)sender
+{
+	[self close];
+}
+
+- (IBAction)ok:(id)sender
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	
+	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:[defaults dictionaryForKey:PrefsKey]];
+	[writeDic setObject:[NSNumber numberWithInt:[portNum intValue]] forKey:kIPPORT];
+	[writeDic setObject:[NSNumber numberWithInt:[playerNum intValue]] forKey:kPLAYERNUM];
+	[writeDic setObject:[ipAddress  stringValue] forKey:kIPADDRKEY];
+
+	// write to defaults
+	[defaults setObject:writeDic forKey:PrefsKey];
+	[defaults synchronize];
+
+	// and set global values accordingly
+	ReadConfig();
+
+	[self close];
+}
+
+- (void)loadValues
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	ReadConfig();
+	NSDictionary *keyValues = [defaults dictionaryForKey:PrefsKey];
+
+	[ipAddress setStringValue:[keyValues objectForKey:kIPADDRKEY]];
+	[portNum setStringValue:[[keyValues objectForKey:kIPPORT] stringValue]];
+	[playerNum setStringValue:[[keyValues objectForKey:kPLAYERNUM] stringValue]];
+}
+
+@end
+
+char* PLUGLOC(char *toloc)
+{
+	NSBundle *mainBundle = [NSBundle bundleForClass:[PluginConfigController class]];
+	NSString *origString = nil, *transString = nil;
+	origString = [NSString stringWithCString:toloc encoding:NSUTF8StringEncoding];
+	transString = [mainBundle localizedStringForKey:origString value:nil table:nil];
+	return [transString cStringUsingEncoding:NSUTF8StringEncoding];
+}
+
diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.h b/macosx/plugins/DFNet/macsrc/SockDialog.h
new file mode 100644
index 00000000..2898ceec
--- /dev/null
+++ b/macosx/plugins/DFNet/macsrc/SockDialog.h
@@ -0,0 +1,16 @@
+//
+//  SockDialog.h
+//  DFNet
+//
+//  Created by C.W. Betts on 2/18/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+
+
+@interface SockDialog : NSWindowController {
+
+}
+- (IBAction)cancel:(id)sender;
+@end
diff --git a/macosx/plugins/DFNet/macsrc/SockDialog.m b/macosx/plugins/DFNet/macsrc/SockDialog.m
new file mode 100644
index 00000000..e49ffc3d
--- /dev/null
+++ b/macosx/plugins/DFNet/macsrc/SockDialog.m
@@ -0,0 +1,85 @@
+//
+//  SockDialog.m
+//  DFNet
+//
+//  Created by C.W. Betts on 2/18/11.
+//  Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import "SockDialog.h"
+#include "dfnet.h"
+
+void SysMessage(const char *fmt, ...) {
+	va_list list;
+	char msg[512];
+	//char cmd[512];
+	
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+	
+	//sprintf(cmd, "message %s\n", msg);
+	NSString *errString = [NSString stringWithUTF8String:msg];
+	fprintf(stderr, "%s", msg);
+	NSAlert *alert = [NSAlert alertWithMessageText:nil defaultButton:@"Exit" alternateButton:nil otherButton:nil informativeTextWithFormat:errString];
+	[alert setAlertStyle:NSCriticalAlertStyle];
+	//NSInteger result = NSRunAlertPanel(errString, nil, @"Okay", nil, nil);
+	NSInteger result = [alert runModal];
+	if (result == NSAlertDefaultReturn)
+	{
+		//TODO: Handle closing the emulator, but not quitting the program.
+	}
+}
+
+
+static SockDialog *globalSock = nil;
+
+void sockCreateWaitDlg() {
+	if (globalSock == nil) {
+		globalSock = [[SockDialog alloc] init];
+	}
+	[globalSock showWindow:nil];
+	NSWindow *tempWindow = [globalSock window];
+	[tempWindow center];
+	[tempWindow makeKeyAndOrderFront:nil];
+
+}
+
+void sockDlgUpdate() {
+	
+}
+
+long sockOpen()
+{
+	return 0;
+}
+
+void sockDestroyWaitDlg() {
+	if (globalSock != nil) {
+		[globalSock close];
+		[globalSock release];
+		globalSock = nil;
+	}
+}
+
+@implementation SockDialog
+- (IBAction)cancel:(id)sender {
+	WaitCancel = 1;
+
+}
+
+- (id)init {
+	if ((self = [super initWithWindowNibName:@"SockDialog"])) {
+		return self;
+	} else {
+		[self autorelease];
+		return nil;
+	}
+}
+
+-(void)dealloc {
+	
+	[super dealloc];
+}
+
+@end
diff --git a/macosx/plugins/DFNet/macsrc/cfg.c b/macosx/plugins/DFNet/macsrc/cfg.c
new file mode 100644
index 00000000..a61e6cd8
--- /dev/null
+++ b/macosx/plugins/DFNet/macsrc/cfg.c
@@ -0,0 +1,51 @@
+//
+// DF Netplay Plugin
+//
+// Based on netSock 0.2 by linuzappz.
+// The Plugin is free source code.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "dfnet.h"
+
+#define CFG_FILENAME "dfnet.cfg"
+
+void AboutDlgProc();
+void ConfDlgProc();
+
+void NETabout() {
+	AboutDlgProc();
+}
+
+long NETconfigure() {
+	ConfDlgProc();
+	
+	return 0;
+}
+
+void SaveConf() {
+	FILE *f;
+
+	f = fopen(CFG_FILENAME, "w");
+	if (f == NULL) return;
+	fwrite(&conf, 1, sizeof(conf), f);
+	fclose(f);
+}
+
+void LoadConf() {
+	FILE *f;
+
+	f = fopen(CFG_FILENAME, "r");
+	if (f == NULL) {
+		conf.PlayerNum = 1;
+		conf.PortNum = 33306;
+		strcpy(conf.ipAddress, "127.0.0.1");
+		return;
+	}
+
+	fread(&conf, 1, sizeof(conf), f);
+	fclose(f);
+}
diff --git a/macosx/plugins/DFNet/version.plist b/macosx/plugins/DFNet/version.plist
new file mode 100644
index 00000000..a9c51a62
--- /dev/null
+++ b/macosx/plugins/DFNet/version.plist
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildVersion</key>
+	<string>38</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>ProjectName</key>
+	<string>DFCdrom</string>
+	<key>SourceVersion</key>
+	<string>2350000</string>
+</dict>
+</plist>
diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
index d83cb3bb..bcf4b56e 100644
--- a/plugins/dfnet/dfnet.h
+++ b/plugins/dfnet/dfnet.h
@@ -23,6 +23,28 @@
 #include <locale.h>

 #define _(x)  gettext(x)

 #define N_(x) (x)

+#elif defined(__MACOSX__)	

+#ifdef __cplusplus

+extern "C" {

+#endif

+#ifdef PCSXRCORE

+extern char* Pcsxr_locale_text(char* toloc);

+#define _(String) Pcsxr_locale_text(String)

+#define N_(String) String

+#else

+#ifndef PCSXRPLUG

+#warning please define the plug being built to use Mac OS X localization!

+#define _(msgid) msgid

+#define N_(msgid) msgid

+#endif

+#define PLUGLOC PCSXRPLUG##_locale_text

+extern char* PLUGLOC(char* toloc);

+#define _(String) PLUGLOC(String)

+#define N_(String) String

+#endif

+#ifdef __cplusplus

+}

+#endif

 #else

 #define _(x)  (x)

 #define N_(x) (x)

diff --git a/plugins/dfnet/unix.c b/plugins/dfnet/unix.c
index 50c00269..ad3a1d0f 100644
--- a/plugins/dfnet/unix.c
+++ b/plugins/dfnet/unix.c
@@ -34,19 +34,6 @@ int ExecCfg(const char *arg, int f) {
 	return system(cfg);

 }

 

-void SysMessage(const char *fmt, ...) {

-	va_list list;

-	char msg[512];

-	char cmd[512];

-

-	va_start(list, fmt);

-	vsprintf(msg, fmt, list);

-	va_end(list);

-

-	sprintf(cmd, "message %s\n", msg);

-	ExecCfg(cmd, 1);

-}

-

 long sockInit() {

 	conf.PlayerNum = 0;

 	tm.tv_sec = 0;

@@ -59,14 +46,6 @@ long sockShutdown() {
 	return 0;

 }

 

-long sockOpen() {

-	if (ExecCfg("open", 0) == 0) return -1;

-

-	LoadConf();

-

-	return 0;

-}

-

 int sockPing() {

 	char data[32];

 	struct timeval tv, tvn;

@@ -82,6 +61,29 @@ int sockPing() {
 		   (tvn.tv_usec - tv.tv_usec) / 1000;

 }

 

+#ifndef _MACOSX

+void SysMessage(const char *fmt, ...) {

+	va_list list;

+	char msg[512];

+	char cmd[512];

+

+	va_start(list, fmt);

+	vsprintf(msg, fmt, list);

+	va_end(list);

+

+	sprintf(cmd, "message %s\n", msg);

+	ExecCfg(cmd, 1);

+}

+

+

+long sockOpen() {

+	if (ExecCfg("open", 0) == 0) return -1;

+

+	LoadConf();

+

+	return 0;

+}

+

 void CALLBACK NETconfigure() {

 	ExecCfg("configure", 1);

 }

@@ -116,6 +118,7 @@ void sockDestroyWaitDlg() {
 		cfgpid = 0;

 	}

 }

+#endif

 

 long timeGetTime() {

 	struct timeval tv;