Gecko codes: Added parenthesis where they were needed.(thanks to glennrics and soren) Fixed a copy paste error with write & fill 8bit codes. Also forgot to remove a return false;.(some more codes should work (fixed issue 2968)) New Wiimote Plugin: Added emulated swinging.(seems to work) Changed the emulated calibration data to some nice values. ControllerInterface: moved and constified some stuff.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5980 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
2010-07-26 05:30:50 +00:00
parent 0eaa7352fd
commit 5be58c6772
17 changed files with 224 additions and 224 deletions

View File

@ -121,8 +121,13 @@ void ControllerInterface::SetHwnd( void* const hwnd )
//
// update input for all devices, return true if all devices returned successful
//
bool ControllerInterface::UpdateInput()
bool ControllerInterface::UpdateInput(const bool force)
{
if (force)
update_lock.Enter();
else if (false == update_lock.TryEnter())
return false;
size_t ok_count = 0;
std::vector<Device*>::const_iterator
@ -137,6 +142,7 @@ bool ControllerInterface::UpdateInput()
//(*d)->ClearInputState();
}
update_lock.Leave();
return (m_devices.size() == ok_count);
}
@ -145,8 +151,13 @@ bool ControllerInterface::UpdateInput()
//
// update output for all devices, return true if all devices returned successful
//
bool ControllerInterface::UpdateOutput()
bool ControllerInterface::UpdateOutput(const bool force)
{
if (force)
update_lock.Enter();
else if (false == update_lock.TryEnter())
return false;
size_t ok_count = 0;
std::vector<Device*>::const_iterator
@ -155,6 +166,7 @@ bool ControllerInterface::UpdateOutput()
for (;d != e; ++d)
(*d)->UpdateOutput();
update_lock.Leave();
return (m_devices.size() == ok_count);
}

View File

@ -6,7 +6,9 @@
#include <sstream>
#include <map>
#include <algorithm>
#include "Common.h"
#include "Thread.h"
// enable disable sources
#ifdef _WIN32
@ -214,12 +216,14 @@ public:
bool IsInit() const { return m_is_init; }
void UpdateReference(ControlReference* control, const DeviceQualifier& default_device) const;
bool UpdateInput();
bool UpdateOutput();
bool UpdateInput(const bool force = false);
bool UpdateOutput(const bool force = false);
const std::vector<Device*>& Devices() const { return m_devices; }
Device* FindDevice(const DeviceQualifier& devq) const;
Common::CriticalSection update_lock;
private:
bool m_is_init;
std::vector<Device*> m_devices;

View File

@ -19,7 +19,7 @@ namespace ciface
namespace DInput
{
static struct
static const struct
{
const BYTE code;
const char* const name;
@ -28,7 +28,7 @@ static struct
#include "NamedKeys.h"
};
static struct
static const struct
{
const BYTE code;
const char* const name;

View File

@ -9,7 +9,7 @@ namespace ciface
namespace XInput
{
static struct
static const struct
{
const char* const name;
const WORD bitmask;