Resolve asio network crashes on macOS (#157)

* Reenable network tab functionality for macOS

* Set asio to b73dc1d and  websocketpp to c6d7e29

src/headers/switch-network.hpp

@@ -4,9 +4,6 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 
 #pragma once
 
-// Due to iussues with asio the network functionality will be disabled on macOS
-#if !(__APPLE__)
-
 #include <set>
 #include <QtCore/QObject>
 #include <QtCore/QMutex>
@@ -16,16 +13,36 @@ Most of this code is based on https://github.com/Palakis/obs-websocket
 #include <mutex>
 #include <condition_variable>
 
+#include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/config/asio_no_tls.hpp>
 #include <websocketpp/server.hpp>
-
-#include <websocketpp/config/asio_no_tls_client.hpp>
 #include <websocketpp/client.hpp>
 
 using websocketpp::connection_hdl;
 typedef websocketpp::server<websocketpp::config::asio> server;
 typedef websocketpp::client<websocketpp::config::asio_client> client;
 
+class NetworkConfig {
+public:
+	NetworkConfig();
+	void Load(obs_data_t *obj);
+	void Save(obs_data_t *obj);
+	void SetDefaults(obs_data_t *obj);
+
+	std::string GetClientUri();
+
+	// Server
+	bool ServerEnabled;
+	uint64_t ServerPort;
+	bool LockToIPv4;
+
+	// Client
+	bool ClientEnabled;
+	std::string Address;
+	uint64_t ClientPort;
+	bool SendAll;
+};
+
 class WSServer : public QObject {
 	Q_OBJECT
 
@@ -52,6 +69,12 @@ private:
 	QThreadPool _threadPool;
 };
 
+enum class ServerStatus {
+	NOT_RUNNING,
+	STARTING,
+	RUNNING,
+};
+
 class WSClient : public QObject {
 	Q_OBJECT
 
@@ -80,62 +103,6 @@ private:
 	std::string _failMsg;
 };
 
-#else
-
-class WSServer : public QObject {
-	Q_OBJECT
-
-public:
-	explicit WSServer(){};
-	virtual ~WSServer(){};
-	void start(quint16 port, bool lockToIPv4){};
-	void stop(){};
-	void sendMessage(OBSWeakSource scene, OBSWeakSource transition){};
-};
-
-class WSClient : public QObject {
-	Q_OBJECT
-
-public:
-	explicit WSClient(){};
-	virtual ~WSClient(){};
-	void connect(std::string uri){};
-	void disconnect(){};
-	std::string getFail() { return _failMsg; }
-
-private:
-	std::string _failMsg;
-};
-
-#endif
-
-class NetworkConfig {
-public:
-	NetworkConfig();
-	void Load(obs_data_t *obj);
-	void Save(obs_data_t *obj);
-	void SetDefaults(obs_data_t *obj);
-
-	std::string GetClientUri();
-
-	// Server
-	bool ServerEnabled;
-	uint64_t ServerPort;
-	bool LockToIPv4;
-
-	// Client
-	bool ClientEnabled;
-	std::string Address;
-	uint64_t ClientPort;
-	bool SendAll;
-};
-
-enum class ServerStatus {
-	NOT_RUNNING,
-	STARTING,
-	RUNNING,
-};
-
 enum class ClientStatus {
 	DISCONNECTED,
 	CONNECTING,