piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Light cleanup to a little bit of InputCommon. Replaces much of the iterators that litter this section of the codebase.

Browse Source 
Also clean up a little bit of the comments that describe the interface classes.
This commit is contained in:
Lioncash
2014-01-30 19:51:21 -05:00
parent b5b02de663
commit d91a5abba1
13 changed files with 301 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
Source/Core/InputCommon/ControllerEmu.cpp
View File

@ -11,38 +11,23 @@
ControllerEmu::~ControllerEmu() ControllerEmu::~ControllerEmu()
{ {
// control groups // control groups
std::vector<ControlGroup*>::const_iterator for (ControlGroup* cg : groups)
i = groups.begin(), delete cg;
e = groups.end();
for (; i!=e; ++i)
delete *i;
} }
ControllerEmu::ControlGroup::~ControlGroup() ControllerEmu::ControlGroup::~ControlGroup()
{ {
// controls for (Control* c : controls)
std::vector<Control*>::const_iterator delete c;
ci = controls.begin(),
ce = controls.end();
for (; ci!=ce; ++ci)
delete *ci;
// settings for (Setting* s : settings)
std::vector<Setting*>::const_iterator delete s;
si = settings.begin(),
se = settings.end();
for (; si!=se; ++si)
delete *si;
} }
ControllerEmu::Extension::~Extension() ControllerEmu::Extension::~Extension()
{ {
// attachments for (ControllerEmu* ai : attachments)
std::vector<ControllerEmu*>::const_iterator delete ai;
ai = attachments.begin(),
ae = attachments.end();
for (; ai!=ae; ++ai)
delete *ai;
} }
ControllerEmu::ControlGroup::Control::~Control() ControllerEmu::ControlGroup::Control::~Control()
{ {
@ -51,52 +36,31 @@ ControllerEmu::ControlGroup::Control::~Control()
void ControllerEmu::UpdateReferences(ControllerInterface& devi) void ControllerEmu::UpdateReferences(ControllerInterface& devi)
{ {
std::vector<ControlGroup*>::const_iterator for (ControlGroup* cg : groups)
i = groups.begin(),
e = groups.end();
for (; i!=e; ++i)
{ {
std::vector<ControlGroup::Control*>::const_iterator for (ControlGroup::Control* control : cg->controls)
ci = (*i)->controls.begin(), devi.UpdateReference(control->control_ref, default_device);
ce = (*i)->controls.end();
for (; ci!=ce; ++ci)
devi.UpdateReference((*ci)->control_ref, default_device);
// extension // extension
if (GROUP_TYPE_EXTENSION == (*i)->type) if (GROUP_TYPE_EXTENSION == cg->type)
{ {
std::vector<ControllerEmu*>::const_iterator for (ControllerEmu* ai : ((Extension*)cg)->attachments)
ai = ((Extension*)*i)->attachments.begin(), ai->UpdateReferences(devi);
ae = ((Extension*)*i)->attachments.end();
for (; ai!=ae; ++ai)
(*ai)->UpdateReferences(devi);
} }
} }
} }
void ControllerEmu::UpdateDefaultDevice() void ControllerEmu::UpdateDefaultDevice()
{ {
std::vector<ControlGroup*>::const_iterator for (ControlGroup* cg : groups)
i = groups.begin(),
e = groups.end();
for (; i!=e; ++i)
{ {
//std::vector<ControlGroup::Control*>::const_iterator
//ci = (*i)->controls.begin(),
//ce = (*i)->controls.end();
//for (; ci!=ce; ++ci)
//(*ci)->control_ref->device_qualifier = default_device;
// extension // extension
if (GROUP_TYPE_EXTENSION == (*i)->type) if (GROUP_TYPE_EXTENSION == cg->type)
{ {
std::vector<ControllerEmu*>::const_iterator for (ControllerEmu* ai : ((Extension*)cg)->attachments)
ai = ((Extension*)*i)->attachments.begin(),
ae = ((Extension*)*i)->attachments.end();
for (; ai!=ae; ++ai)
{ {
(*ai)->default_device = default_device; ai->default_device = default_device;
(*ai)->UpdateDefaultDevice(); ai->UpdateDefaultDevice();
} }
} }
} }
@ -107,50 +71,43 @@ void ControllerEmu::ControlGroup::LoadConfig(IniFile::Section *sec, const std::s
std::string group(base + name); group += "/"; std::string group(base + name); group += "/";
// settings // settings
std::vector<ControlGroup::Setting*>::const_iterator for (Setting* s : settings)
si = settings.begin(),
se = settings.end();
for (; si!=se; ++si)
{ {
sec->Get((group+(*si)->name).c_str(), &(*si)->value, (*si)->default_value*100); sec->Get((group + s->name).c_str(), &s->value, s->default_value * 100);
(*si)->value /= 100; s->value /= 100;
} }
// controls // controls
std::vector<ControlGroup::Control*>::const_iterator for (Control* c : controls)
ci = controls.begin(),
ce = controls.end();
for (; ci!=ce; ++ci)
{ {
// control expression // control expression
sec->Get((group + (*ci)->name).c_str(), &(*ci)->control_ref->expression, ""); sec->Get((group + c->name).c_str(), &c->control_ref->expression, "");
// range // range
sec->Get((group+(*ci)->name+"/Range").c_str(), &(*ci)->control_ref->range, 100.0f); sec->Get((group + c->name + "/Range").c_str(), &c->control_ref->range, 100.0f);
(*ci)->control_ref->range /= 100; c->control_ref->range /= 100;
} }
// extensions // extensions
if (GROUP_TYPE_EXTENSION == type) if (GROUP_TYPE_EXTENSION == type)
{ {
Extension* const ex = ((Extension*)this); Extension* const ext = ((Extension*)this);
ex->switch_extension = 0; ext->switch_extension = 0;
unsigned int n = 0; unsigned int n = 0;
std::string extname; std::string extname;
sec->Get((base + name).c_str(), &extname, ""); sec->Get((base + name).c_str(), &extname, "");
std::vector<ControllerEmu*>::const_iterator for (ControllerEmu* ai : ext->attachments)
ai = ((Extension*)this)->attachments.begin(),
ae = ((Extension*)this)->attachments.end();
for (; ai!=ae; ++ai,++n)
{ {
(*ai)->default_device.FromString(defdev); ai->default_device.FromString(defdev);
(*ai)->LoadConfig(sec, base + (*ai)->GetName() + "/"); ai->LoadConfig(sec, base + ai->GetName() + "/");
if ((*ai)->GetName() == extname) if (ai->GetName() == extname)
ex->switch_extension = n; ext->switch_extension = n;
n++;
} }
} }
} }
@ -163,10 +120,9 @@ void ControllerEmu::LoadConfig(IniFile::Section *sec, const std::string& base)
sec->Get((base + "Device").c_str(), &defdev, ""); sec->Get((base + "Device").c_str(), &defdev, "");
default_device.FromString(defdev); default_device.FromString(defdev);
} }
std::vector<ControlGroup*>::const_iterator i = groups.begin(),
e = groups.end(); for (ControlGroup* cg : groups)
for (; i!=e; ++i) cg->LoadConfig(sec, defdev, base);
(*i)->LoadConfig(sec, defdev, base);
} }
void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base) void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::string& defdev, const std::string& base)
@ -174,23 +130,17 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s
std::string group(base + name); group += "/"; std::string group(base + name); group += "/";
// settings // settings
std::vector<ControlGroup::Setting*>::const_iterator for (Setting* s : settings)
si = settings.begin(), sec->Set((group + s->name).c_str(), s->value*100.0f, s->default_value*100.0f);
se = settings.end();
for (; si!=se; ++si)
sec->Set((group+(*si)->name).c_str(), (*si)->value*100.0f, (*si)->default_value*100.0f);
// controls // controls
std::vector<ControlGroup::Control*>::const_iterator for (Control* c : controls)
ci = controls.begin(),
ce = controls.end();
for (; ci!=ce; ++ci)
{ {
// control expression // control expression
sec->Set((group+(*ci)->name).c_str(), (*ci)->control_ref->expression, ""); sec->Set((group + c->name).c_str(), c->control_ref->expression, "");
// range // range
sec->Set((group+(*ci)->name+"/Range").c_str(), (*ci)->control_ref->range*100.0f, 100.0f); sec->Set((group + c->name + "/Range").c_str(), c->control_ref->range*100.0f, 100.0f);
} }
// extensions // extensions
@ -199,11 +149,8 @@ void ControllerEmu::ControlGroup::SaveConfig(IniFile::Section *sec, const std::s
Extension* const ext = ((Extension*)this); Extension* const ext = ((Extension*)this);
sec->Set((base + name).c_str(), ext->attachments[ext->switch_extension]->GetName(), "None"); sec->Set((base + name).c_str(), ext->attachments[ext->switch_extension]->GetName(), "None");
std::vector<ControllerEmu*>::const_iterator for (ControllerEmu* ai : ext->attachments)
ai = ((Extension*)this)->attachments.begin(), ai->SaveConfig(sec, base + ai->GetName() + "/");
ae = ((Extension*)this)->attachments.end();
for (; ai!=ae; ++ai)
(*ai)->SaveConfig(sec, base + (*ai)->GetName() + "/");
} }
} }
@ -213,10 +160,8 @@ void ControllerEmu::SaveConfig(IniFile::Section *sec, const std::string& base)
if (base.empty()) if (base.empty())
sec->Set((/*std::string(" ") +*/ base + "Device").c_str(), defdev, ""); sec->Set((/*std::string(" ") +*/ base + "Device").c_str(), defdev, "");
std::vector<ControlGroup*>::const_iterator i = groups.begin(), for (ControlGroup* cg : groups)
e = groups.end(); cg->SaveConfig(sec, defdev, base);
for (; i!=e; ++i)
(*i)->SaveConfig(sec, defdev, base);
} }
ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(_name, GROUP_TYPE_STICK) ControllerEmu::AnalogStick::AnalogStick(const char* const _name) : ControlGroup(_name, GROUP_TYPE_STICK)

60
Source/Core/InputCommon/ControllerEmu.h
View File

@ -42,7 +42,7 @@ enum
SETTING_SQUARE, SETTING_SQUARE,
}; };
const char * const named_directions[] = const char* const named_directions[] =
{ {
"Up", "Up",
"Down", "Down",
@ -61,13 +61,13 @@ public:
class Control class Control
{ {
protected: protected:
Control(ControllerInterface::ControlReference* const _ref, const char * const _name) Control(ControllerInterface::ControlReference* const _ref, const char* const _name)
: control_ref(_ref), name(_name){} : control_ref(_ref), name(_name){}
public: public:
virtual ~Control(); virtual ~Control();
ControllerInterface::ControlReference* const control_ref; ControllerInterface::ControlReference* const control_ref;
const char * const name; const char* const name;
}; };
@ -75,7 +75,7 @@ public:
{ {
public: public:
Input(const char * const _name) Input(const char* const _name)
: Control(new ControllerInterface::InputReference, _name) {} : Control(new ControllerInterface::InputReference, _name) {}
}; };
@ -84,7 +84,7 @@ public:
{ {
public: public:
Output(const char * const _name) Output(const char* const _name)
: Control(new ControllerInterface::OutputReference, _name) {} : Control(new ControllerInterface::OutputReference, _name) {}
}; };
@ -94,17 +94,17 @@ public:
public: public:
Setting(const char* const _name, const ControlState def_value Setting(const char* const _name, const ControlState def_value
, const unsigned int _low = 0, const unsigned int _high = 100 ) , const unsigned int _low = 0, const unsigned int _high = 100)
: name(_name) : name(_name)
, value(def_value) , value(def_value)
, default_value(def_value) , default_value(def_value)
, low(_low) , low(_low)
, high(_high){} , high(_high){}
const char* const name; const char* const name;
ControlState value; ControlState value;
const ControlState default_value; const ControlState default_value;
const unsigned int low, high; const unsigned int low, high;
}; };
ControlGroup(const char* const _name, const unsigned int _type = GROUP_TYPE_OTHER) : name(_name), type(_type) {} ControlGroup(const char* const _name, const unsigned int _type = GROUP_TYPE_OTHER) : name(_name), type(_type) {}
@ -113,11 +113,11 @@ public:
virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void LoadConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" ); virtual void SaveConfig(IniFile::Section *sec, const std::string& defdev = "", const std::string& base = "" );
const char* const name; const char* const name;
const unsigned int type; const unsigned int type;
std::vector< Control* > controls; std::vector<Control*> controls;
std::vector< Setting* > settings; std::vector<Setting*> settings;
}; };
@ -194,14 +194,12 @@ public:
template <typename C> template <typename C>
void GetState(C* const buttons, const C* bitmasks) void GetState(C* const buttons, const C* bitmasks)
{ {
std::vector<Control*>::iterator for (Control* control : controls)
i = controls.begin(),
e = controls.end();
for (; i!=e; ++i, ++bitmasks)
{ {
if ((*i)->control_ref->State() > settings[0]->value) // threshold if (control->control_ref->State() > settings[0]->value) // threshold
*buttons |= *bitmasks; *buttons |= *bitmasks;
bitmasks++;
} }
} }
@ -287,12 +285,13 @@ public:
tmpf = ((state - (deadzone * sign(state))) / (1 - deadzone)); tmpf = ((state - (deadzone * sign(state))) / (1 - deadzone));
float &ax = m_swing[i >> 1]; float &ax = m_swing[i >> 1];
*axis++ = (C)((tmpf - ax) * range + base); *axis++ = (C)((tmpf - ax) * range + base);
ax = tmpf; ax = tmpf;
} }
} }
private: private:
float m_swing[3]; float m_swing[3];
}; };
class Tilt : public ControlGroup class Tilt : public ControlGroup
@ -370,8 +369,9 @@ public:
*y = C(m_tilt[1] * angle * range + base); *y = C(m_tilt[1] * angle * range + base);
*x = C(m_tilt[0] * angle * range + base); *x = C(m_tilt[0] * angle * range + base);
} }
private: private:
float m_tilt[2]; float m_tilt[2];
}; };
class Cursor : public ControlGroup class Cursor : public ControlGroup
@ -415,7 +415,7 @@ public:
} }
} }
float m_z; float m_z;
}; };
class Extension : public ControlGroup class Extension : public ControlGroup
@ -429,10 +429,10 @@ public:
void GetState(u8* const data, const bool focus = true); void GetState(u8* const data, const bool focus = true);
std::vector<ControllerEmu*> attachments; std::vector<ControllerEmu*> attachments;
int switch_extension; int switch_extension;
int active_extension; int active_extension;
}; };
virtual ~ControllerEmu(); virtual ~ControllerEmu();
@ -447,9 +447,9 @@ public:
void UpdateReferences(ControllerInterface& devi); void UpdateReferences(ControllerInterface& devi);
std::vector< ControlGroup* > groups; std::vector<ControlGroup*> groups;
DeviceQualifier default_device; DeviceQualifier default_device;
}; };

80
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -38,9 +38,9 @@ const float INPUT_DETECT_THRESHOLD = 0.55f;
ControllerInterface g_controller_interface; ControllerInterface g_controller_interface;
// //
// Init // Init
// //
// detect devices and inputs outputs / will make refresh function later // Detect devices and inputs outputs / will make refresh function later
// //
void ControllerInterface::Initialize() void ControllerInterface::Initialize()
{ {
@ -79,31 +79,26 @@ if (GLWin.platform == EGL_PLATFORM_X11) {
} }
// //
// DeInit // DeInit
// //
// remove all devices/ call library cleanup functions // Remove all devices/ call library cleanup functions
// //
void ControllerInterface::Shutdown() void ControllerInterface::Shutdown()
{ {
if (false == m_is_init) if (!m_is_init)
return; return;
std::vector<Device*>::const_iterator for (Device* d : m_devices)
d = m_devices.begin(),
de = m_devices.end();
for ( ;d != de; ++d )
{ {
std::vector<Device::Output*>::const_iterator // Set outputs to ZERO before destroying device
o = (*d)->Outputs().begin(), for (Device::Output* o : d->Outputs())
oe = (*d)->Outputs().end(); o->SetState(0);
// set outputs to ZERO before destroying device
for ( ;o!=oe; ++o)
(*o)->SetState(0);
// update output
(*d)->UpdateOutput();
//delete device // Update output
delete *d; d->UpdateOutput();
// Delete device
delete d;
} }
m_devices.clear(); m_devices.clear();
@ -132,9 +127,9 @@ void ControllerInterface::Shutdown()
} }
// //
// SetHwnd // SetHwnd
// //
// sets the hwnd used for some crap when initializing, use before calling Init // Sets the hwnd used for some crap when initializing, use before calling Init
// //
void ControllerInterface::SetHwnd( void* const hwnd ) void ControllerInterface::SetHwnd( void* const hwnd )
{ {
@ -142,9 +137,9 @@ void ControllerInterface::SetHwnd( void* const hwnd )
} }
// //
// UpdateInput // UpdateInput
// //
// update input for all devices, return true if all devices returned successful // Update input for all devices, return true if all devices returned successful
// //
bool ControllerInterface::UpdateInput(const bool force) bool ControllerInterface::UpdateInput(const bool force)
{ {
@ -153,16 +148,13 @@ bool ControllerInterface::UpdateInput(const bool force)
if (force) if (force)
lk.lock(); lk.lock();
else if (!lk.try_lock()) else if (!lk.try_lock())
return false; return false;
size_t ok_count = 0; size_t ok_count = 0;
std::vector<Device*>::const_iterator for (Device* d : m_devices)
d = m_devices.begin(),
e = m_devices.end();
for ( ;d != e; ++d )
{ {
if ((*d)->UpdateInput()) if (d->UpdateInput())
++ok_count; ++ok_count;
//else //else
// disabled. it might be causing problems // disabled. it might be causing problems
@ -173,9 +165,9 @@ bool ControllerInterface::UpdateInput(const bool force)
} }
// //
// UpdateOutput // UpdateOutput
// //
// update output for all devices, return true if all devices returned successful // Update output for all devices, return true if all devices returned successful
// //
bool ControllerInterface::UpdateOutput(const bool force) bool ControllerInterface::UpdateOutput(const bool force)
{ {
@ -188,9 +180,9 @@ bool ControllerInterface::UpdateOutput(const bool force)
size_t ok_count = 0; size_t ok_count = 0;
for (auto d = m_devices.cbegin(); d != m_devices.cend(); ++d) for (Device* d : m_devices)
{ {
if ((*d)->UpdateOutput()) if (d->UpdateOutput())
++ok_count; ++ok_count;
} }
@ -198,9 +190,9 @@ bool ControllerInterface::UpdateOutput(const bool force)
} }
// //
// InputReference :: State // InputReference :: State
// //
// get the state of an input reference // Gets the state of an input reference
// override function for ControlReference::State ... // override function for ControlReference::State ...
// //
ControlState ControllerInterface::InputReference::State( const ControlState ignore ) ControlState ControllerInterface::InputReference::State( const ControlState ignore )
@ -212,11 +204,11 @@ ControlState ControllerInterface::InputReference::State( const ControlState igno
} }
// //
// OutputReference :: State // OutputReference :: State
// //
// set the state of all binded outputs // Set the state of all binded outputs
// overrides ControlReference::State .. combined them so i could make the gui simple / inputs == same as outputs one list // overrides ControlReference::State .. combined them so I could make the GUI simple / inputs == same as outputs one list
// i was lazy and it works so watever // I was lazy and it works so watever
// //
ControlState ControllerInterface::OutputReference::State(const ControlState state) ControlState ControllerInterface::OutputReference::State(const ControlState state)
{ {
@ -226,9 +218,9 @@ ControlState ControllerInterface::OutputReference::State(const ControlState stat
} }
// //
// UpdateReference // UpdateReference
// //
// updates a controlreference's binded devices/controls // Updates a controlreference's binded devices/controls
// need to call this to re-parse a control reference's expression after changing it // need to call this to re-parse a control reference's expression after changing it
// //
void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref void ControllerInterface::UpdateReference(ControllerInterface::ControlReference* ref
@ -242,9 +234,9 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
} }
// //
// InputReference :: Detect // InputReference :: Detect
// //
// wait for input on all binded devices // Wait for input on all binded devices
// supports not detecting inputs that were held down at the time of Detect start, // supports not detecting inputs that were held down at the time of Detect start,
// which is useful for those crazy flightsticks that have certain buttons that are always held down // which is useful for those crazy flightsticks that have certain buttons that are always held down
// or some crazy axes or something // or some crazy axes or something
@ -294,7 +286,7 @@ Device::Control* ControllerInterface::InputReference::Detect(const unsigned int
} }
// //
// OutputReference :: Detect // OutputReference :: Detect
// //
// Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI. // Totally different from the inputReference detect / I have them combined so it was simpler to make the GUI.
// The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy // The GUI doesn't know the difference between an input and an output / it's odd but I was lazy and it was easy

40
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View File

@ -35,24 +35,24 @@
using namespace ciface::Core; using namespace ciface::Core;
// //
// ControllerInterface // ControllerInterface
// //
// some crazy shit I made to control different device inputs and outputs // Some crazy shit I made to control different device inputs and outputs
// from lots of different sources, hopefully more easily // from lots of different sources, hopefully more easily.
// //
class ControllerInterface : public DeviceContainer class ControllerInterface : public DeviceContainer
{ {
public: public:
// //
// ControlReference // ControlReference
// //
// these are what you create to actually use the inputs, InputReference or OutputReference // These are what you create to actually use the inputs, InputReference or OutputReference.
// //
// after being bound to devices and controls with ControllerInterface::UpdateReference, // After being bound to devices and controls with ControllerInterface::UpdateReference,
// each one can link to multiple devices and controls // each one can link to multiple devices and controls
// when you change a ControlReference's expression, // when you change a ControlReference's expression,
// you must use ControllerInterface::UpdateReference on it to rebind controls // you must use ControllerInterface::UpdateReference on it to rebind controls
// //
class ControlReference class ControlReference
{ {
@ -62,15 +62,17 @@ public:
virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0; virtual Device::Control* Detect(const unsigned int ms, Device* const device) = 0;
ControlState range; ControlState range;
std::string expression; std::string expression;
const bool is_input; const bool is_input;
ciface::ExpressionParser::ExpressionParseStatus parse_error; ciface::ExpressionParser::ExpressionParseStatus parse_error;
virtual ~ControlReference() { virtual ~ControlReference()
{
delete parsed_expression; delete parsed_expression;
} }
int BoundCount() { int BoundCount()
{
if (parsed_expression) if (parsed_expression)
return parsed_expression->num_controls; return parsed_expression->num_controls;
else else
@ -83,9 +85,9 @@ public:
}; };
// //
// InputReference // InputReference
// //
// control reference for inputs // Control reference for inputs
// //
class InputReference : public ControlReference class InputReference : public ControlReference
{ {
@ -96,9 +98,9 @@ public:
}; };
// //
// OutputReference // OutputReference
// //
// control reference for outputs // Control reference for outputs
// //
class OutputReference : public ControlReference class OutputReference : public ControlReference
{ {
@ -122,8 +124,8 @@ public:
std::recursive_mutex update_lock; std::recursive_mutex update_lock;
private: private:
bool m_is_init; bool m_is_init;
void* m_hwnd; void* m_hwnd;
}; };
extern ControllerInterface g_controller_interface; extern ControllerInterface g_controller_interface;

134
Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.cpp
View File

@ -49,81 +49,81 @@ void GetXInputGUIDS( std::vector<DWORD>& guids )
#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } } #define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
IWbemLocator* pIWbemLocator = NULL; IWbemLocator* pIWbemLocator = NULL;
IEnumWbemClassObject* pEnumDevices = NULL; IEnumWbemClassObject* pEnumDevices = NULL;
IWbemClassObject* pDevices[20] = {0}; IWbemClassObject* pDevices[20] = {0};
IWbemServices* pIWbemServices = NULL; IWbemServices* pIWbemServices = NULL;
BSTR bstrNamespace = NULL; BSTR bstrNamespace = NULL;
BSTR bstrDeviceID = NULL; BSTR bstrDeviceID = NULL;
BSTR bstrClassName = NULL; BSTR bstrClassName = NULL;
DWORD uReturned = 0; DWORD uReturned = 0;
VARIANT var; VARIANT var;
HRESULT hr; HRESULT hr;
// CoInit if needed // CoInit if needed
hr = CoInitialize(NULL); hr = CoInitialize(NULL);
bool bCleanupCOM = SUCCEEDED(hr); bool bCleanupCOM = SUCCEEDED(hr);
// Create WMI // Create WMI
hr = CoCreateInstance( __uuidof(WbemLocator), hr = CoCreateInstance(__uuidof(WbemLocator),
NULL, NULL,
CLSCTX_INPROC_SERVER, CLSCTX_INPROC_SERVER,
__uuidof(IWbemLocator), __uuidof(IWbemLocator),
(LPVOID*) &pIWbemLocator); (LPVOID*) &pIWbemLocator);
if( FAILED(hr) || pIWbemLocator == NULL ) if (FAILED(hr) || pIWbemLocator == NULL)
goto LCleanup; goto LCleanup;
bstrNamespace = SysAllocString( L"\\\\.\\root\\cimv2" );if( bstrNamespace == NULL ) goto LCleanup; bstrNamespace = SysAllocString(L"\\\\.\\root\\cimv2");if(bstrNamespace == NULL) goto LCleanup;
bstrClassName = SysAllocString( L"Win32_PNPEntity" ); if( bstrClassName == NULL ) goto LCleanup; bstrClassName = SysAllocString(L"Win32_PNPEntity"); if(bstrClassName == NULL) goto LCleanup;
bstrDeviceID = SysAllocString( L"DeviceID" ); if( bstrDeviceID == NULL ) goto LCleanup; bstrDeviceID = SysAllocString(L"DeviceID"); if(bstrDeviceID == NULL) goto LCleanup;
// Connect to WMI // Connect to WMI
hr = pIWbemLocator->ConnectServer( bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices ); hr = pIWbemLocator->ConnectServer(bstrNamespace, NULL, NULL, 0L, 0L, NULL, NULL, &pIWbemServices);
if( FAILED(hr) || pIWbemServices == NULL ) if (FAILED(hr) || pIWbemServices == NULL)
goto LCleanup; goto LCleanup;
// Switch security level to IMPERSONATE. // Switch security level to IMPERSONATE.
CoSetProxyBlanket( pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL, CoSetProxyBlanket(pIWbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, NULL,
RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE ); RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE);
hr = pIWbemServices->CreateInstanceEnum( bstrClassName, 0, NULL, &pEnumDevices ); hr = pIWbemServices->CreateInstanceEnum(bstrClassName, 0, NULL, &pEnumDevices);
if( FAILED(hr) || pEnumDevices == NULL ) if (FAILED(hr) || pEnumDevices == NULL)
goto LCleanup; goto LCleanup;
// Loop over all devices // Loop over all devices
while( true ) while (true)
{ {
// Get 20 at a time // Get 20 at a time
hr = pEnumDevices->Next( 10000, 20, pDevices, &uReturned ); hr = pEnumDevices->Next(10000, 20, pDevices, &uReturned);
if( FAILED(hr) || uReturned == 0 ) if (FAILED(hr) || uReturned == 0)
break; break;
for( UINT iDevice=0; iDevice<uReturned; ++iDevice ) for (UINT iDevice = 0; iDevice < uReturned; ++iDevice)
{ {
// For each device, get its device ID // For each device, get its device ID
hr = pDevices[iDevice]->Get( bstrDeviceID, 0L, &var, NULL, NULL ); hr = pDevices[iDevice]->Get(bstrDeviceID, 0L, &var, NULL, NULL);
if( SUCCEEDED( hr ) && var.vt == VT_BSTR && var.bstrVal != NULL ) if (SUCCEEDED(hr) && var.vt == VT_BSTR && var.bstrVal != NULL)
{ {
// Check if the device ID contains "IG_". If it does, then it's an XInput device // Check if the device ID contains "IG_". If it does, then it's an XInput device
// This information can not be found from DirectInput // This information can not be found from DirectInput
if( wcsstr( var.bstrVal, L"IG_" ) ) if (wcsstr(var.bstrVal, L"IG_"))
{ {
// If it does, then get the VID/PID from var.bstrVal // If it does, then get the VID/PID from var.bstrVal
DWORD dwPid = 0, dwVid = 0; DWORD dwPid = 0, dwVid = 0;
WCHAR* strVid = wcsstr( var.bstrVal, L"VID_" ); WCHAR* strVid = wcsstr(var.bstrVal, L"VID_");
if( strVid && swscanf( strVid, L"VID_%4X", &dwVid ) != 1 ) if (strVid && swscanf(strVid, L"VID_%4X", &dwVid) != 1)
dwVid = 0; dwVid = 0;
WCHAR* strPid = wcsstr( var.bstrVal, L"PID_" ); WCHAR* strPid = wcsstr(var.bstrVal, L"PID_");
if( strPid && swscanf( strPid, L"PID_%4X", &dwPid ) != 1 ) if (strPid && swscanf(strPid, L"PID_%4X", &dwPid) != 1)
dwPid = 0; dwPid = 0;
// Compare the VID/PID to the DInput device // Compare the VID/PID to the DInput device
DWORD dwVidPid = MAKELONG( dwVid, dwPid ); DWORD dwVidPid = MAKELONG(dwVid, dwPid);
guids.push_back( dwVidPid ); guids.push_back(dwVidPid);
//bIsXinputDevice = true; //bIsXinputDevice = true;
} }
} }
SAFE_RELEASE( pDevices[iDevice] ); SAFE_RELEASE(pDevices[iDevice]);
} }
} }
@ -134,13 +134,13 @@ LCleanup:
SysFreeString(bstrDeviceID); SysFreeString(bstrDeviceID);
if(bstrClassName) if(bstrClassName)
SysFreeString(bstrClassName); SysFreeString(bstrClassName);
for( UINT iDevice=0; iDevice<20; iDevice++ ) for (UINT iDevice = 0; iDevice < 20; iDevice++)
SAFE_RELEASE( pDevices[iDevice] ); SAFE_RELEASE(pDevices[iDevice]);
SAFE_RELEASE( pEnumDevices ); SAFE_RELEASE(pEnumDevices);
SAFE_RELEASE( pIWbemLocator ); SAFE_RELEASE(pIWbemLocator);
SAFE_RELEASE( pIWbemServices ); SAFE_RELEASE(pIWbemServices);
if( bCleanupCOM ) if (bCleanupCOM)
CoUninitialize(); CoUninitialize();
} }
@ -156,17 +156,14 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices
std::vector<DWORD> xinput_guids; std::vector<DWORD> xinput_guids;
GetXInputGUIDS( xinput_guids ); GetXInputGUIDS( xinput_guids );
std::list<DIDEVICEINSTANCE>::iterator for (DIDEVICEINSTANCE& joystick : joysticks)
i = joysticks.begin(),
e = joysticks.end();
for ( ; i!=e; ++i )
{ {
// skip XInput Devices // skip XInput Devices
if ( std::find( xinput_guids.begin(), xinput_guids.end(), i->guidProduct.Data1 ) != xinput_guids.end() ) if (std::find(xinput_guids.begin(), xinput_guids.end(), joystick.guidProduct.Data1) != xinput_guids.end())
continue; continue;
LPDIRECTINPUTDEVICE8 js_device; LPDIRECTINPUTDEVICE8 js_device;
if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &js_device, NULL))) if (SUCCEEDED(idi8->CreateDevice(joystick.guidInstance, &js_device, NULL)))
{ {
if (SUCCEEDED(js_device->SetDataFormat(&c_dfDIJoystick))) if (SUCCEEDED(js_device->SetDataFormat(&c_dfDIJoystick)))
{ {
@ -182,7 +179,7 @@ void InitJoystick(IDirectInput8* const idi8, std::vector<Core::Device*>& devices
} }
} }
Joystick* js = new Joystick(/*&*i, */js_device, name_counts[i->tszInstanceName]++); Joystick* js = new Joystick(/*&*i, */js_device, name_counts[joystick.tszInstanceName]++);
// only add if it has some inputs/outputs // only add if it has some inputs/outputs
if (js->Inputs().size() || js->Outputs().size()) if (js->Inputs().size() || js->Outputs().size())
devices.push_back(js); devices.push_back(js);
@ -359,14 +356,11 @@ Joystick::Joystick( /*const LPCDIDEVICEINSTANCE lpddi, */const LPDIRECTINPUTDEVI
Joystick::~Joystick() Joystick::~Joystick()
{ {
// release the ff effect iface's // release the ff effect iface's
std::list<EffectState>::iterator for (EffectState& state : m_state_out)
i = m_state_out.begin(),
e = m_state_out.end();
for (; i!=e; ++i)
{ {
i->iface->Stop(); state.iface->Stop();
i->iface->Unload(); state.iface->Unload();
i->iface->Release(); state.iface->Release();
} }
m_device->Unacquire(); m_device->Unacquire();
@ -377,7 +371,7 @@ void Joystick::ClearInputState()
{ {
ZeroMemory(&m_state_in, sizeof(m_state_in)); ZeroMemory(&m_state_in, sizeof(m_state_in));
// set hats to center // set hats to center
memset( m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV) ); memset(m_state_in.rgdwPOV, 0xFF, sizeof(m_state_in.rgdwPOV));
} }
std::string Joystick::GetName() const std::string Joystick::GetName() const
@ -449,26 +443,23 @@ bool Joystick::UpdateOutput()
eff.dwSize = sizeof(DIEFFECT); eff.dwSize = sizeof(DIEFFECT);
eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS; eff.dwFlags = DIEFF_CARTESIAN | DIEFF_OBJECTOFFSETS;
std::list<EffectState>::iterator for (EffectState& state : m_state_out)
i = m_state_out.begin(),
e = m_state_out.end();
for (; i!=e; ++i)
{ {
if (i->params) if (state.params)
{ {
if (i->size) if (state.size)
{ {
eff.cbTypeSpecificParams = i->size; eff.cbTypeSpecificParams = state.size;
eff.lpvTypeSpecificParams = i->params; eff.lpvTypeSpecificParams = state.params;
// set params and start effect // set params and start effect
ok_count += SUCCEEDED(i->iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START)); ok_count += SUCCEEDED(state.iface->SetParameters(&eff, DIEP_TYPESPECIFICPARAMS | DIEP_START));
} }
else else
{ {
ok_count += SUCCEEDED(i->iface->Stop()); ok_count += SUCCEEDED(state.iface->Stop());
} }
i->params = NULL; state.params = NULL;
} }
else else
{ {
@ -540,6 +531,7 @@ ControlState Joystick::Hat::GetState() const
// hat centered code from MSDN // hat centered code from MSDN
if (0xFFFF == LOWORD(m_hat)) if (0xFFFF == LOWORD(m_hat))
return 0; return 0;
return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2); return (abs((int)(m_hat / 4500 - m_direction * 2 + 8) % 8 - 4) > 2);
} }

22
Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
View File

@ -25,9 +25,9 @@ private:
{ {
EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {} EffectState(LPDIRECTINPUTEFFECT eff) : iface(eff), params(NULL), size(0) {}
LPDIRECTINPUTEFFECT iface; LPDIRECTINPUTEFFECT iface;
void* params; // null when force hasn't changed void* params; // null when force hasn't changed
u8 size; // zero when force should stop u8 size; // zero when force should stop
}; };
class Button : public Input class Button : public Input
@ -76,9 +76,9 @@ private:
P params; P params;
const u8 m_index; const u8 m_index;
}; };
typedef Force<DICONSTANTFORCE> ForceConstant; typedef Force<DICONSTANTFORCE> ForceConstant;
typedef Force<DIRAMPFORCE> ForceRamp; typedef Force<DIRAMPFORCE> ForceRamp;
typedef Force<DIPERIODIC> ForcePeriodic; typedef Force<DIPERIODIC> ForcePeriodic;
public: public:
bool UpdateInput(); bool UpdateInput();
@ -94,13 +94,13 @@ public:
std::string GetSource() const; std::string GetSource() const;
private: private:
const LPDIRECTINPUTDEVICE8 m_device; const LPDIRECTINPUTDEVICE8 m_device;
const unsigned int m_index; const unsigned int m_index;
DIJOYSTATE m_state_in; DIJOYSTATE m_state_in;
std::list<EffectState> m_state_out; std::list<EffectState> m_state_out;
bool m_buffered; bool m_buffered;
}; };
} }

12
Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.cpp
View File

@ -5,11 +5,11 @@
// (lower would be more sensitive) user can lower sensitivity by setting range // (lower would be more sensitive) user can lower sensitivity by setting range
// seems decent here ( at 8 ), I don't think anyone would need more sensitive than this // seems decent here ( at 8 ), I don't think anyone would need more sensitive than this
// and user can lower it much farther than they would want to with the range // and user can lower it much farther than they would want to with the range
#define MOUSE_AXIS_SENSITIVITY 8 #define MOUSE_AXIS_SENSITIVITY 8
// if input hasn't been received for this many ms, mouse input will be skipped // if input hasn't been received for this many ms, mouse input will be skipped
// otherwise it is just some crazy value // otherwise it is just some crazy value
#define DROP_INPUT_TIME 250 #define DROP_INPUT_TIME 250
namespace ciface namespace ciface
{ {
@ -18,8 +18,8 @@ namespace DInput
static const struct static const struct
{ {
const BYTE code; const BYTE code;
const char* const name; const char* const name;
} named_keys[] = } named_keys[] =
{ {
#include "NamedKeys.h" #include "NamedKeys.h"
@ -27,8 +27,8 @@ static const struct
static const struct static const struct
{ {
const BYTE code; const BYTE code;
const char* const name; const char* const name;
} named_lights[] = } named_lights[] =
{ {
{ VK_NUMLOCK, "NUM LOCK" }, { VK_NUMLOCK, "NUM LOCK" },

16
Source/Core/InputCommon/ControllerInterface/DInput/DInputKeyboardMouse.h
View File

@ -21,8 +21,8 @@ class KeyboardMouse : public Core::Device
private: private:
struct State struct State
{ {
BYTE keyboard[256]; BYTE keyboard[256];
DIMOUSESTATE2 mouse; DIMOUSESTATE2 mouse;
struct struct
{ {
float x, y; float x, y;
@ -98,13 +98,13 @@ public:
std::string GetSource() const; std::string GetSource() const;
private: private:
const LPDIRECTINPUTDEVICE8 m_kb_device; const LPDIRECTINPUTDEVICE8 m_kb_device;
const LPDIRECTINPUTDEVICE8 m_mo_device; const LPDIRECTINPUTDEVICE8 m_mo_device;
DWORD m_last_update; DWORD m_last_update;
State m_state_in; State m_state_in;
unsigned char m_state_out[3]; // NUM CAPS SCROLL unsigned char m_state_out[3]; // NUM CAPS SCROLL
bool m_current_state_out[3]; // NUM CAPS SCROLL bool m_current_state_out[3]; // NUM CAPS SCROLL
}; };
} }

79
Source/Core/InputCommon/ControllerInterface/Device.cpp
View File

@ -10,29 +10,19 @@ namespace Core
{ {
// //
// Device :: ~Device // Device :: ~Device
// //
// Destructor, delete all inputs/outputs on device destruction // Destructor, delete all inputs/outputs on device destruction
// //
Device::~Device() Device::~Device()
{ {
{
// delete inputs // delete inputs
std::vector<Device::Input*>::iterator for (Device::Input* input : m_inputs)
i = m_inputs.begin(), delete input;
e = m_inputs.end();
for ( ;i!=e; ++i)
delete *i;
}
{
// delete outputs // delete outputs
std::vector<Device::Output*>::iterator for (Device::Output* output: m_outputs)
o = m_outputs.begin(), delete output;
e = m_outputs.end();
for ( ;o!=e; ++o)
delete *o;
}
} }
void Device::AddInput(Device::Input* const i) void Device::AddInput(Device::Input* const i)
@ -47,30 +37,28 @@ void Device::AddOutput(Device::Output* const o)
Device::Input* Device::FindInput(const std::string &name) const Device::Input* Device::FindInput(const std::string &name) const
{ {
std::vector<Input*>::const_iterator for (Input* input : m_inputs)
it = m_inputs.begin(), {
itend = m_inputs.end(); if (input->GetName() == name)
for (; it != itend; ++it) return input;
if ((*it)->GetName() == name) }
return *it;
return NULL; return NULL;
} }
Device::Output* Device::FindOutput(const std::string &name) const Device::Output* Device::FindOutput(const std::string &name) const
{ {
std::vector<Output*>::const_iterator for (Output* output : m_outputs)
it = m_outputs.begin(), {
itend = m_outputs.end(); if (output->GetName() == name)
for (; it != itend; ++it) return output;
if ((*it)->GetName() == name) }
return *it;
return NULL; return NULL;
} }
// //
// Device :: ClearInputState // Device :: ClearInputState
// //
// Device classes should override this function // Device classes should override this function
// ControllerInterface will call this when the device returns failure during UpdateInput // ControllerInterface will call this when the device returns failure during UpdateInput
@ -84,26 +72,28 @@ void Device::ClearInputState()
} }
// //
// DeviceQualifier :: ToString // DeviceQualifier :: ToString
// //
// get string from a device qualifier / serialize // Get string from a device qualifier / serialize
// //
std::string DeviceQualifier::ToString() const std::string DeviceQualifier::ToString() const
{ {
if (source.empty() && (cid < 0) && name.empty()) if (source.empty() && (cid < 0) && name.empty())
return ""; return "";
std::ostringstream ss; std::ostringstream ss;
ss << source << '/'; ss << source << '/';
if ( cid > -1 ) if (cid > -1)
ss << cid; ss << cid;
ss << '/' << name; ss << '/' << name;
return ss.str(); return ss.str();
} }
// //
// DeviceQualifier :: FromString // DeviceQualifier :: FromString
// //
// set a device qualifier from a string / unserialize // Set a device qualifier from a string / unserialize
// //
void DeviceQualifier::FromString(const std::string& str) void DeviceQualifier::FromString(const std::string& str)
{ {
@ -119,9 +109,9 @@ void DeviceQualifier::FromString(const std::string& str)
} }
// //
// DeviceQualifier :: FromDevice // DeviceQualifier :: FromDevice
// //
// set a device qualifier from a device // Set a device qualifier from a device
// //
void DeviceQualifier::FromDevice(const Device* const dev) void DeviceQualifier::FromDevice(const Device* const dev)
{ {
@ -136,6 +126,7 @@ bool DeviceQualifier::operator==(const Device* const dev) const
if (dev->GetName() == name) if (dev->GetName() == name)
if (dev->GetSource() == source) if (dev->GetSource() == source)
return true; return true;
return false; return false;
} }
@ -151,12 +142,11 @@ bool DeviceQualifier::operator==(const DeviceQualifier& devq) const
Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const Device* DeviceContainer::FindDevice(const DeviceQualifier& devq) const
{ {
std::vector<Device*>::const_iterator for (Device* d : m_devices)
di = m_devices.begin(), {
de = m_devices.end(); if (devq == d)
for (; di!=de; ++di) return d;
if (devq == *di) }
return *di;
return NULL; return NULL;
} }
@ -170,12 +160,9 @@ Device::Input* DeviceContainer::FindInput(const std::string& name, const Device*
return inp; return inp;
} }
std::vector<Device*>::const_iterator for (Device* d : m_devices)
di = m_devices.begin(),
de = m_devices.end();
for (; di != de; ++di)
{ {
Device::Input* const i = (*di)->FindInput(name); Device::Input* const i = d->FindInput(name);
if (i) if (i)
return i; return i;

34
Source/Core/InputCommon/ControllerInterface/Device.h
View File

@ -19,9 +19,9 @@ namespace Core
class DeviceQualifier; class DeviceQualifier;
// //
// Device // Device
// //
// a device class // A device class
// //
class Device class Device
{ {
@ -30,11 +30,11 @@ public:
class Output; class Output;
// //
// Control // Control
// //
// control includes inputs and outputs // Control includes inputs and outputs
// //
class Control // input or output class Control // input or output
{ {
public: public:
virtual std::string GetName() const = 0; virtual std::string GetName() const = 0;
@ -45,9 +45,9 @@ public:
}; };
// //
// Input // Input
// //
// an input on a device // An input on a device
// //
class Input : public Control class Input : public Control
{ {
@ -61,9 +61,9 @@ public:
}; };
// //
// Output // Output
// //
// an output on a device // An output on a device
// //
class Output : public Control class Output : public Control
{ {
@ -126,15 +126,15 @@ protected:
} }
private: private:
std::vector<Input*> m_inputs; std::vector<Input*> m_inputs;
std::vector<Output*> m_outputs; std::vector<Output*> m_outputs;
}; };
// //
// DeviceQualifier // DeviceQualifier
// //
// device qualifier used to match devices // Device qualifier used to match devices.
// currently has ( source, id, name ) properties which match a device // Currently has ( source, id, name ) properties which match a device
// //
class DeviceQualifier class DeviceQualifier
{ {
@ -148,9 +148,9 @@ public:
bool operator==(const DeviceQualifier& devq) const; bool operator==(const DeviceQualifier& devq) const;
bool operator==(const Device* const dev) const; bool operator==(const Device* const dev) const;
std::string source; std::string source;
int cid; int cid;
std::string name; std::string name;
}; };
class DeviceContainer class DeviceContainer

20
Source/Core/InputCommon/GCPadStatus.h
View File

@ -27,16 +27,16 @@
typedef struct typedef struct
{ {
unsigned short button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits unsigned short button; // Or-ed PAD_BUTTON_* and PAD_TRIGGER_* bits
unsigned char stickX; // 0 <= stickX <= 255 unsigned char stickX; // 0 <= stickX <= 255
unsigned char stickY; // 0 <= stickY <= 255 unsigned char stickY; // 0 <= stickY <= 255
unsigned char substickX; // 0 <= substickX <= 255 unsigned char substickX; // 0 <= substickX <= 255
unsigned char substickY; // 0 <= substickY <= 255 unsigned char substickY; // 0 <= substickY <= 255
unsigned char triggerLeft; // 0 <= triggerLeft <= 255 unsigned char triggerLeft; // 0 <= triggerLeft <= 255
unsigned char triggerRight; // 0 <= triggerRight <= 255 unsigned char triggerRight; // 0 <= triggerRight <= 255
unsigned char analogA; // 0 <= analogA <= 255 unsigned char analogA; // 0 <= analogA <= 255
unsigned char analogB; // 0 <= analogB <= 255 unsigned char analogB; // 0 <= analogB <= 255
signed char err; // one of PAD_ERR_* number signed char err; // one of PAD_ERR_* number
} SPADStatus; } SPADStatus;
#endif #endif

31
Source/Core/InputCommon/InputConfig.cpp
View File

@ -10,10 +10,8 @@
InputPlugin::~InputPlugin() InputPlugin::~InputPlugin()
{ {
// delete pads // delete pads
std::vector<ControllerEmu*>::const_iterator i = controllers.begin(), for (ControllerEmu* pad : controllers)
e = controllers.end(); delete pad;
for ( ; i != e; ++i )
delete *i;
} }
bool InputPlugin::LoadConfig(bool isGC) bool InputPlugin::LoadConfig(bool isGC)
@ -58,25 +56,26 @@ bool InputPlugin::LoadConfig(bool isGC)
if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini")) if (inifile.Load(File::GetUserPath(D_CONFIG_IDX) + ini_name + ".ini"))
{ {
std::vector< ControllerEmu* >::const_iterator int n = 0;
i = controllers.begin(), for (ControllerEmu* pad : controllers)
e = controllers.end();
for (int n = 0; i!=e; ++i, ++n)
{ {
// load settings from ini // Load settings from ini
if (useProfile[n]) if (useProfile[n])
{ {
IniFile profile_ini; IniFile profile_ini;
profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini"); profile_ini.Load(File::GetUserPath(D_CONFIG_IDX) + path + profile[n] + ".ini");
(*i)->LoadConfig(profile_ini.GetOrCreateSection("Profile")); pad->LoadConfig(profile_ini.GetOrCreateSection("Profile"));
} }
else else
{ {
(*i)->LoadConfig(inifile.GetOrCreateSection((*i)->GetName().c_str())); pad->LoadConfig(inifile.GetOrCreateSection(pad->GetName().c_str()));
} }
// update refs // Update refs
(*i)->UpdateReferences(g_controller_interface); pad->UpdateReferences(g_controller_interface);
// Next profile
n++;
} }
return true; return true;
} }
@ -95,10 +94,8 @@ void InputPlugin::SaveConfig()
IniFile inifile; IniFile inifile;
inifile.Load(ini_filename); inifile.Load(ini_filename);
std::vector< ControllerEmu* >::const_iterator i = controllers.begin(), for (ControllerEmu* pad : controllers)
e = controllers.end(); pad->SaveConfig(inifile.GetOrCreateSection(pad->GetName().c_str()));
for ( ; i!=e; ++i )
(*i)->SaveConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
inifile.Save(ini_filename); inifile.Save(ini_filename);
} }

10
Source/Core/InputCommon/InputConfig.h
View File

@ -30,13 +30,13 @@ public:
bool LoadConfig(bool isGC); bool LoadConfig(bool isGC);
void SaveConfig(); void SaveConfig();
std::vector< ControllerEmu* > controllers; std::vector<ControllerEmu*> controllers;
std::recursive_mutex controls_lock; // for changing any control references std::recursive_mutex controls_lock; // for changing any control references
const char * const ini_name; const char* const ini_name;
const char * const gui_name; const char* const gui_name;
const char * const profile_name; const char* const profile_name;
}; };
#endif #endif