mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-11-18 01:38:08 -06:00
Merge pull request #15016 from jordan-woyak/remove-bb-dump-port
HW/WiimoteReal: Remove BBDumpPort feature.
This commit is contained in:
@@ -216,7 +216,6 @@ const Info<bool> MAIN_CONNECT_WIIMOTES_FOR_CONTROLLER_INTERFACE{
|
||||
{System::Main, "Core", "WiimoteControllerInterface"}, false};
|
||||
const Info<bool> MAIN_MMU{{System::Main, "Core", "MMU"}, false};
|
||||
const Info<bool> MAIN_PAUSE_ON_PANIC{{System::Main, "Core", "PauseOnPanic"}, false};
|
||||
const Info<int> MAIN_BB_DUMP_PORT{{System::Main, "Core", "BBDumpPort"}, -1};
|
||||
const Info<bool> MAIN_SYNC_GPU{{System::Main, "Core", "SyncGPU"}, false};
|
||||
const Info<int> MAIN_SYNC_GPU_MAX_DISTANCE{{System::Main, "Core", "SyncGpuMaxDistance"}, 200000};
|
||||
const Info<int> MAIN_SYNC_GPU_MIN_DISTANCE{{System::Main, "Core", "SyncGpuMinDistance"}, -200000};
|
||||
|
||||
@@ -119,7 +119,6 @@ extern const Info<bool> MAIN_WIIMOTE_ENABLE_SPEAKER;
|
||||
extern const Info<bool> MAIN_CONNECT_WIIMOTES_FOR_CONTROLLER_INTERFACE;
|
||||
extern const Info<bool> MAIN_MMU;
|
||||
extern const Info<bool> MAIN_PAUSE_ON_PANIC;
|
||||
extern const Info<int> MAIN_BB_DUMP_PORT;
|
||||
extern const Info<bool> MAIN_SYNC_GPU;
|
||||
extern const Info<int> MAIN_SYNC_GPU_MAX_DISTANCE;
|
||||
extern const Info<int> MAIN_SYNC_GPU_MIN_DISTANCE;
|
||||
|
||||
@@ -7,8 +7,6 @@
|
||||
#include <mutex>
|
||||
#include <unordered_set>
|
||||
|
||||
#include <SFML/Network/UdpSocket.hpp>
|
||||
|
||||
#include "Common/CommonTypes.h"
|
||||
#include "Common/Config/Config.h"
|
||||
#include "Common/Swap.h"
|
||||
@@ -290,13 +288,6 @@ bool Wiimote::Read()
|
||||
// Drop the report if not connected.
|
||||
if (m_is_linked && result > 0)
|
||||
{
|
||||
if (m_balance_board_dump_port > 0 && m_index == WIIMOTE_BALANCE_BOARD)
|
||||
{
|
||||
static sf::UdpSocket Socket;
|
||||
(void)Socket.send(rpt.data(), rpt.size(), sf::IpAddress::LocalHost,
|
||||
m_balance_board_dump_port);
|
||||
}
|
||||
|
||||
// Add it to queue
|
||||
rpt.resize(result);
|
||||
m_read_reports.Push(std::move(rpt));
|
||||
@@ -309,13 +300,6 @@ bool Wiimote::Write(const TimedReport& timed_report)
|
||||
{
|
||||
auto const& rpt = timed_report.report;
|
||||
|
||||
if (m_balance_board_dump_port > 0 && m_index == WIIMOTE_BALANCE_BOARD)
|
||||
{
|
||||
static sf::UdpSocket Socket;
|
||||
(void)Socket.send((char*)rpt.data(), rpt.size(), sf::IpAddress::LocalHost,
|
||||
m_balance_board_dump_port);
|
||||
}
|
||||
|
||||
// Write the report at the proper time, mainly for speaker data, not that it will help much.
|
||||
std::this_thread::sleep_until(timed_report.time);
|
||||
int ret = IOWrite(rpt.data(), rpt.size());
|
||||
@@ -863,7 +847,6 @@ void Wiimote::WriteThreadFunc()
|
||||
void Wiimote::RefreshConfig()
|
||||
{
|
||||
m_speaker_enabled_in_dolphin_config = Config::Get(Config::MAIN_WIIMOTE_ENABLE_SPEAKER);
|
||||
m_balance_board_dump_port = Config::Get(Config::MAIN_BB_DUMP_PORT);
|
||||
}
|
||||
|
||||
int Wiimote::GetIndex() const
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
#include "Common/Event.h"
|
||||
#include "Common/Flag.h"
|
||||
#include "Common/SPSCQueue.h"
|
||||
#include "Common/WorkQueueThread.h"
|
||||
|
||||
#include "Core/HW/Wiimote.h"
|
||||
#include "Core/HW/WiimoteCommon/WiimoteConstants.h"
|
||||
@@ -167,7 +166,6 @@ private:
|
||||
Common::Event m_write_event;
|
||||
|
||||
bool m_speaker_enabled_in_dolphin_config = false;
|
||||
int m_balance_board_dump_port = 0;
|
||||
|
||||
Config::ConfigChangedCallbackID m_config_changed_callback_id;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user