mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-27 06:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5791 from leoetlino/wiimote-indicator

Browse Source 
Remove Wii Remote connection status from status bar
This commit is contained in:
Leo Lam 2017-07-22 22:03:25 +08:00 committed by GitHub
commit efd318df64
8 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Android/jni/MainAndroid.cpp
View File

@ -144,10 +144,6 @@ void Host_ConnectWiimote(int wm_idx, bool connect)
{ {
} }
void Host_SetWiiMoteConnectionState(int _State)
{
}
void Host_ShowVideoConfig(void*, const std::string&) void Host_ShowVideoConfig(void*, const std::string&)
{ {
} }

1
Source/Core/Core/Host.h
View File

@ -31,7 +31,6 @@ void Host_Message(int Id);
void Host_NotifyMapLoaded(); void Host_NotifyMapLoaded();
void Host_RefreshDSPDebuggerWindow(); void Host_RefreshDSPDebuggerWindow();
void Host_RequestRenderWindowSize(int width, int height); void Host_RequestRenderWindowSize(int width, int height);
void Host_SetWiiMoteConnectionState(int _State);
void Host_UpdateDisasmDialog(); void Host_UpdateDisasmDialog();
void Host_UpdateMainFrame(); void Host_UpdateMainFrame();
void Host_UpdateTitle(const std::string& title); void Host_UpdateTitle(const std::string& title);

7
Source/Core/Core/IOS/USB/Bluetooth/BTEmu.cpp
View File

@ -91,13 +91,10 @@ BluetoothEmu::BluetoothEmu(Kernel& ios, const std::string& device_name)
m_ControllerBD.b[3] = 0x79; m_ControllerBD.b[3] = 0x79;
m_ControllerBD.b[4] = 0x00; m_ControllerBD.b[4] = 0x00;
m_ControllerBD.b[5] = 0xFF; m_ControllerBD.b[5] = 0xFF;
Host_SetWiiMoteConnectionState(0);
} }
BluetoothEmu::~BluetoothEmu() BluetoothEmu::~BluetoothEmu()
{ {
Host_SetWiiMoteConnectionState(0);
m_WiiMotes.clear(); m_WiiMotes.clear();
} }
@ -355,10 +352,7 @@ void BluetoothEmu::Update()
for (auto& wiimote : m_WiiMotes) for (auto& wiimote : m_WiiMotes)
{ {
if (wiimote.EventPagingChanged(m_ScanEnable)) if (wiimote.EventPagingChanged(m_ScanEnable))
{
Host_SetWiiMoteConnectionState(1);
SendEventRequestConnection(wiimote); SendEventRequestConnection(wiimote);
}
} }
} }
@ -1203,7 +1197,6 @@ void BluetoothEmu::CommandDisconnect(const u8* input)
DEBUG_LOG(IOS_WIIMOTE, " ConnectionHandle: 0x%04x", disconnect->con_handle); DEBUG_LOG(IOS_WIIMOTE, " ConnectionHandle: 0x%04x", disconnect->con_handle);
DEBUG_LOG(IOS_WIIMOTE, " Reason: 0x%02x", disconnect->reason); DEBUG_LOG(IOS_WIIMOTE, " Reason: 0x%02x", disconnect->reason);
Host_SetWiiMoteConnectionState(0);
DisplayDisconnectMessage((disconnect->con_handle & 0xFF) + 1, disconnect->reason); DisplayDisconnectMessage((disconnect->con_handle & 0xFF) + 1, disconnect->reason);
SendEventCommandStatus(HCI_CMD_DISCONNECT); SendEventCommandStatus(HCI_CMD_DISCONNECT);

3
Source/Core/Core/IOS/USB/Bluetooth/WiimoteDevice.cpp
View File

@ -910,9 +910,6 @@ void WiimoteDevice::ReceiveL2capData(u16 scid, const void* _pData, u32 _Size)
// Update Offset to the final size of the report // Update Offset to the final size of the report
Offset += _Size; Offset += _Size;
// Update the status bar
Host_SetWiiMoteConnectionState(2);
// Send the report // Send the report
m_pHost->SendACLPacket(GetConnectionHandle(), DataFrame, Offset); m_pHost->SendACLPacket(GetConnectionHandle(), DataFrame, Offset);
} }

4
Source/Core/DolphinNoGUI/MainNoGUI.cpp
View File

@ -147,10 +147,6 @@ void Host_ConnectWiimote(int wm_idx, bool connect)
}); });
} }
void Host_SetWiiMoteConnectionState(int _State)
{
}
void Host_ShowVideoConfig(void*, const std::string&) void Host_ShowVideoConfig(void*, const std::string&)
{ {
} }

3
Source/Core/DolphinQt2/Host.cpp
View File

@ -104,9 +104,6 @@ void Host_NotifyMapLoaded()
void Host_UpdateDisasmDialog() void Host_UpdateDisasmDialog()
{ {
} }
void Host_SetWiiMoteConnectionState(int state)
{
}
void Host_ConnectWiimote(int wm_idx, bool connect) void Host_ConnectWiimote(int wm_idx, bool connect)
{ {
} }

29
Source/Core/DolphinWX/Main.cpp
View File

@ -458,35 +458,6 @@ void Host_RequestRenderWindowSize(int width, int height)
main_frame->GetEventHandler()->AddPendingEvent(event); main_frame->GetEventHandler()->AddPendingEvent(event);
} }
void Host_SetWiiMoteConnectionState(int _State)
{
static int currentState = -1;
if (_State == currentState)
return;
currentState = _State;
wxCommandEvent event(wxEVT_HOST_COMMAND, IDM_UPDATE_STATUS_BAR);
switch (_State)
{
case 0:
event.SetString(_("Not connected"));
break;
case 1:
event.SetString(_("Connecting..."));
break;
case 2:
event.SetString(_("Wii Remote Connected"));
break;
}
// The second field is used for auxiliary info such as this
event.SetInt(1);
NOTICE_LOG(WIIMOTE, "%s", static_cast<const char*>(event.GetString().c_str()));
main_frame->GetEventHandler()->AddPendingEvent(event);
}
bool Host_UINeedsControllerState() bool Host_UINeedsControllerState()
{ {
return wxGetApp().IsActiveThreadsafe() && GetUINeedsControllerState(); return wxGetApp().IsActiveThreadsafe() && GetUINeedsControllerState();

3
Source/UnitTests/StubHost.cpp
View File

@ -54,9 +54,6 @@ bool Host_RendererIsFullscreen()
void Host_ConnectWiimote(int, bool) void Host_ConnectWiimote(int, bool)
{ {
} }
void Host_SetWiiMoteConnectionState(int)
{
}
void Host_ShowVideoConfig(void*, const std::string&) void Host_ShowVideoConfig(void*, const std::string&)
{ {
} }