From 0ef9543f87fe2de20e4d5452e0637e85f533d389 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.noreply.github.com>
Date: Mon, 22 Oct 2018 13:01:42 -0700
Subject: [PATCH] Cocoa Port: Oops! Fix a compiling issue caused by commit
 5d3e53d.

---
 .../frontend/cocoa/ClientExecutionControl.cpp  | 18 ++++++++----------
 .../frontend/cocoa/ClientExecutionControl.h    |  6 +++---
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/desmume/src/frontend/cocoa/ClientExecutionControl.cpp b/desmume/src/frontend/cocoa/ClientExecutionControl.cpp
index 7a45aa864..2382e8900 100644
--- a/desmume/src/frontend/cocoa/ClientExecutionControl.cpp
+++ b/desmume/src/frontend/cocoa/ClientExecutionControl.cpp
@@ -89,7 +89,7 @@ ClientExecutionControl::ClientExecutionControl()
 	_settingsPending.enableFirmwareBoot					= false;
 	_settingsPending.enableDebugConsole					= false;
 	_settingsPending.enableEnsataEmulation				= false;
-	_settingsPending.wifiMode							= WifiCommInterfaceID_AdHoc;
+	_settingsPending.wifiEmulationMode					= WifiEmulationLevel_Off;
 	_settingsPending.wifiBridgeDeviceIndex				= 0;
 	
 	_settingsPending.enableExecutionSpeedLimiter		= true;
@@ -565,19 +565,19 @@ void ClientExecutionControl::SetEnableEnsataEmulation(bool enable)
 	pthread_mutex_unlock(&this->_mutexSettingsPendingOnNDSExec);
 }
 
-int ClientExecutionControl::GetWifiMode()
+int ClientExecutionControl::GetWifiEmulationMode()
 {
 	pthread_mutex_lock(&this->_mutexSettingsPendingOnReset);
-	const int wifiMode = this->_settingsPending.wifiMode;
+	const int wifiEmulationMode = this->_settingsPending.wifiEmulationMode;
 	pthread_mutex_unlock(&this->_mutexSettingsPendingOnReset);
 	
-	return wifiMode;
+	return wifiEmulationMode;
 }
 
-void ClientExecutionControl::SetWifiMode(int wifiMode)
+void ClientExecutionControl::SetWifiEmulationMode(int wifiEmulationMode)
 {
 	pthread_mutex_lock(&this->_mutexSettingsPendingOnReset);
-	this->_settingsPending.wifiMode = wifiMode;
+	this->_settingsPending.wifiEmulationMode = wifiEmulationMode;
 	
 	this->_newSettingsPendingOnReset = true;
 	pthread_mutex_unlock(&this->_mutexSettingsPendingOnReset);
@@ -972,7 +972,7 @@ void ClientExecutionControl::ApplySettingsOnReset()
 		this->_settingsApplied.enableExternalFirmware		= this->_settingsPending.enableExternalFirmware;
 		this->_settingsApplied.enableFirmwareBoot			= this->_settingsPending.enableFirmwareBoot;
 		
-		this->_settingsApplied.wifiMode						= this->_settingsPending.wifiMode;
+		this->_settingsApplied.wifiEmulationMode			= this->_settingsPending.wifiEmulationMode;
 		this->_settingsApplied.wifiBridgeDeviceIndex		= this->_settingsPending.wifiBridgeDeviceIndex;
 		this->_settingsApplied.wifiIP4Address				= this->_settingsPending.wifiIP4Address;
 		
@@ -997,11 +997,9 @@ void ClientExecutionControl::ApplySettingsOnReset()
 		//CommonSettings.UseExtFirmwareSettings	= this->_settingsApplied.enableExternalFirmware;
 		CommonSettings.UseExtFirmwareSettings = false;
 		CommonSettings.BootFromFirmware			= this->_settingsApplied.enableFirmwareBoot;
-		CommonSettings.wifi.mode				= (WifiCommInterfaceID)this->_settingsApplied.wifiMode;
 		CommonSettings.wifi.infraBridgeAdapter	= this->_settingsApplied.wifiBridgeDeviceIndex;
 		
-		wifiHandler->SetIP4Address(this->_settingsApplied.wifiIP4Address);
-		wifiHandler->SetCommInterfaceID((WifiCommInterfaceID)this->_settingsApplied.wifiMode);
+		wifiHandler->SetEmulationLevel((WifiEmulationLevel)this->_settingsApplied.wifiEmulationMode);
 		wifiHandler->SetBridgeDeviceIndex(this->_settingsApplied.wifiBridgeDeviceIndex);
 		
 		if (this->_settingsApplied.filePathARM9BIOS.length() == 0)
diff --git a/desmume/src/frontend/cocoa/ClientExecutionControl.h b/desmume/src/frontend/cocoa/ClientExecutionControl.h
index d416a71aa..d672385bf 100644
--- a/desmume/src/frontend/cocoa/ClientExecutionControl.h
+++ b/desmume/src/frontend/cocoa/ClientExecutionControl.h
@@ -95,7 +95,7 @@ struct ClientExecutionControlSettings
 	bool enableDebugConsole;
 	bool enableEnsataEmulation;
 	
-	int wifiMode;
+	int wifiEmulationMode;
 	int wifiBridgeDeviceIndex;
 	uint32_t wifiIP4Address;
 	
@@ -305,8 +305,8 @@ public:
 	bool GetEnableEnsataEmulation();
 	void SetEnableEnsataEmulation(bool enable);
 	
-	int GetWifiMode();
-	void SetWifiMode(int wifiMode);
+	int GetWifiEmulationMode();
+	void SetWifiEmulationMode(int wifiEmulationMode);
 	
 	int GetWifiBridgeDeviceIndex();
 	void SetWifiBridgeDeviceIndex(int wifiBridgeDeviceIndex);