mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 06:09:50 -06:00
Reformat all the things!
This commit is contained in:
@ -131,8 +131,8 @@ ciface::Core::Device::Control* InputReference::Detect(const unsigned int ms,
|
||||
|
||||
// get starting state of all inputs,
|
||||
// so we can ignore those that were activated at time of Detect start
|
||||
std::vector<ciface::Core::Device::Input *>::const_iterator i = device->Inputs().begin(),
|
||||
e = device->Inputs().end();
|
||||
std::vector<ciface::Core::Device::Input*>::const_iterator i = device->Inputs().begin(),
|
||||
e = device->Inputs().end();
|
||||
for (std::vector<bool>::iterator state = states.begin(); i != e; ++i)
|
||||
*state++ = ((*i)->GetState() > (1 - INPUT_DETECT_THRESHOLD));
|
||||
|
||||
|
@ -405,6 +405,7 @@ class Parser
|
||||
public:
|
||||
explicit Parser(std::vector<Token> tokens_) : tokens(tokens_) { m_it = tokens.begin(); }
|
||||
ParseResult Parse() { return Toplevel(); }
|
||||
|
||||
private:
|
||||
std::vector<Token> tokens;
|
||||
std::vector<Token>::iterator m_it;
|
||||
|
@ -98,6 +98,7 @@ protected:
|
||||
}
|
||||
|
||||
std::string GetName() const override { return m_low.GetName() + *m_high.GetName().rbegin(); }
|
||||
|
||||
private:
|
||||
Input& m_low;
|
||||
Input& m_high;
|
||||
|
@ -33,6 +33,7 @@ public:
|
||||
void UpdateInput() override;
|
||||
std::string GetName() const override { return m_name; }
|
||||
std::string GetSource() const override { return "Pipe"; }
|
||||
|
||||
private:
|
||||
class PipeInput : public Input
|
||||
{
|
||||
@ -41,6 +42,7 @@ private:
|
||||
std::string GetName() const override { return m_name; }
|
||||
ControlState GetState() const override { return m_state; }
|
||||
void SetState(ControlState state) { m_state = state; }
|
||||
|
||||
private:
|
||||
const std::string m_name;
|
||||
ControlState m_state;
|
||||
|
@ -74,6 +74,7 @@ public:
|
||||
std::string GetName() const override { return m_name; }
|
||||
std::string GetSource() const override { return "evdev"; }
|
||||
bool IsInteresting() const { return m_initialized && m_interesting; }
|
||||
|
||||
private:
|
||||
const std::string m_devfile;
|
||||
int m_fd;
|
||||
|
@ -137,8 +137,9 @@ static void ScanThreadFunc()
|
||||
if (s_libusb_hotplug_enabled)
|
||||
{
|
||||
if (libusb_hotplug_register_callback(
|
||||
s_libusb_context, (libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
|
||||
LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
|
||||
s_libusb_context,
|
||||
(libusb_hotplug_event)(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
|
||||
LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT),
|
||||
LIBUSB_HOTPLUG_ENUMERATE, 0x057e, 0x0337, LIBUSB_HOTPLUG_MATCH_ANY, HotplugCallback,
|
||||
nullptr, &s_hotplug_handle) != LIBUSB_SUCCESS)
|
||||
s_libusb_hotplug_enabled = false;
|
||||
@ -267,8 +268,9 @@ static bool CheckDeviceAccess(libusb_device* device)
|
||||
{
|
||||
if (dRet)
|
||||
{
|
||||
ERROR_LOG(SERIALINTERFACE, "Dolphin does not have access to this device: Bus %03d Device "
|
||||
"%03d: ID ????:???? (couldn't get id).",
|
||||
ERROR_LOG(SERIALINTERFACE,
|
||||
"Dolphin does not have access to this device: Bus %03d Device "
|
||||
"%03d: ID ????:???? (couldn't get id).",
|
||||
bus, port);
|
||||
}
|
||||
else
|
||||
|
@ -38,6 +38,7 @@ public:
|
||||
|
||||
std::string GetGUIName() const { return m_gui_name; }
|
||||
std::string GetProfileName() const { return m_profile_name; }
|
||||
|
||||
private:
|
||||
std::vector<std::unique_ptr<ControllerEmu::EmulatedController>> m_controllers;
|
||||
const std::string m_ini_name;
|
||||
|
Reference in New Issue
Block a user