From 33fb1b562fdb1b1280cfbbf194287078929fa932 Mon Sep 17 00:00:00 2001
From: Rachel Bryk <RachelBryk@gmail.com>
Date: Sat, 7 Sep 2013 00:27:35 -0400
Subject: [PATCH] Move some code from NetPlayClient.h to NetPlayProto.h, and
 only include that outside of NetPlay.

---
 Source/Core/Core/Src/BootManager.cpp        | 2 +-
 Source/Core/Core/Src/HW/SI.cpp              | 2 +-
 Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp | 2 +-
 Source/Core/Core/Src/Movie.cpp              | 2 +-
 Source/Core/Core/Src/NetPlayClient.h        | 8 --------
 Source/Core/Core/Src/NetPlayProto.h         | 8 ++++++++
 Source/Core/DolphinWX/Src/ConfigMain.cpp    | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index b2c7dbc058..ec388e4974 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -34,7 +34,7 @@
 #include "Host.h"
 #include "VideoBackendBase.h"
 #include "Movie.h"
-#include "NetPlayClient.h"
+#include "NetPlayProto.h"
 
 namespace BootManager
 {
diff --git a/Source/Core/Core/Src/HW/SI.cpp b/Source/Core/Core/Src/HW/SI.cpp
index ff9057aa4f..76810b7f6d 100644
--- a/Source/Core/Core/Src/HW/SI.cpp
+++ b/Source/Core/Core/Src/HW/SI.cpp
@@ -7,7 +7,7 @@
 #include "../ConfigManager.h"
 #include "../CoreTiming.h"
 #include "../Movie.h"
-#include "../NetPlayClient.h"
+#include "../NetPlayProto.h"
 
 #include "SystemTimers.h"
 #include "ProcessorInterface.h"
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
index 80e8334989..0caa2ed7e8 100644
--- a/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
+++ b/Source/Core/Core/Src/IPC_HLE/WII_Socket.cpp
@@ -6,7 +6,7 @@
 #include "WII_IPC_HLE.h"
 #include "WII_IPC_HLE_Device.h"
 // No Wii socket support while using NetPlay or TAS
-#include "NetPlayClient.h"
+#include "NetPlayProto.h"
 #include "Movie.h"
 
 using WII_IPC_HLE_Interface::ECommandType;
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 5e9804cd25..ddd971c9c1 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -24,7 +24,7 @@
 #include "../../Common/Src/NandPaths.h"
 #include "polarssl/md5.h"
 #include "scmrev.h"
-#include "NetPlayClient.h"
+#include "NetPlayProto.h"
 
 // The chunk to allocate movie data in multiples of.
 #define DTM_BASE_LENGTH (1024)
diff --git a/Source/Core/Core/Src/NetPlayClient.h b/Source/Core/Core/Src/NetPlayClient.h
index db949aaa7c..d6b121a18d 100644
--- a/Source/Core/Core/Src/NetPlayClient.h
+++ b/Source/Core/Core/Src/NetPlayClient.h
@@ -22,8 +22,6 @@
 
 #include "FifoQueue.h"
 
-const int NETPLAY_INITIAL_GCTIME = 1272737767;
-
 class NetPad
 {
 public:
@@ -51,8 +49,6 @@ public:
 	virtual bool IsRecording() = 0;
 };
 
-extern NetSettings g_NetPlaySettings;
-
 class Player
 {
  public:
@@ -131,10 +127,6 @@ private:
 	std::map<PlayerId, Player>	m_players;
 };
 
-namespace NetPlay {
-	bool IsNetPlayRunning();
-};
-
 void NetPlay_Enable(NetPlayClient* const np);
 void NetPlay_Disable();
 
diff --git a/Source/Core/Core/Src/NetPlayProto.h b/Source/Core/Core/Src/NetPlayProto.h
index 900b08f936..2b4c49d97c 100644
--- a/Source/Core/Core/Src/NetPlayProto.h
+++ b/Source/Core/Core/Src/NetPlayProto.h
@@ -18,6 +18,8 @@ struct NetSettings
 	TEXIDevices m_EXIDevice[2];
 };
 
+extern NetSettings g_NetPlaySettings;
+
 struct Rpt : public std::vector<u8>
 {
 	u16		channel;
@@ -27,6 +29,8 @@ typedef std::vector<Rpt>	NetWiimote;
 
 #define NETPLAY_VERSION		"Dolphin NetPlay 2013-09-03"
 
+const int NETPLAY_INITIAL_GCTIME = 1272737767;
+
 // messages
 enum
 {
@@ -67,4 +71,8 @@ enum
 	CON_ERR_VERSION_MISMATCH
 };
 
+namespace NetPlay {
+	bool IsNetPlayRunning();
+};
+
 #endif
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 7ebd617b8a..168e046c29 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -30,7 +30,7 @@
 #include "HotkeyDlg.h"
 #include "Main.h"
 #include "VideoBackendBase.h"
-#include "NetPlayClient.h"
+#include "NetPlayProto.h"
 
 #define TEXT_BOX(page, text) new wxStaticText(page, wxID_ANY, text, wxDefaultPosition, wxDefaultSize)