piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 16:49:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

Start work of OSX keyboard input, doesn't work, so it's currently disabled, but it's a beginning. Also changed variable 'id' to 'cid' because id is a object type in Obj-C, which I was running in to problems with, kept it that way just in case.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5269 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1
2010-04-02 09:41:43 +00:00
parent 2742be1c2e
commit 48533bb3db
7 changed files with 236 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Plugins/Plugin_GCPadNew/Src/ControllerInterface/ControllerInterface.h
View File

@ -21,6 +21,9 @@
#ifndef CIFACE_USE_DIRECTINPUT_JOYSTICK
#define CIFACE_USE_SDL
#endif
#if defined(__APPLE__)
#define CIFACE_USE_OSX
#endif
// idk in case i wanted to change it to double or somethin, idk what's best
typedef float ControlState;
@ -109,16 +112,16 @@ public:
class DeviceQualifier
{
public:
DeviceQualifier() : id(-1){}
DeviceQualifier() : cid(-1){}
DeviceQualifier( const std::string& _source, const int _id, const std::string& _name )
: source(_source), id(_id), name(_name) {}
: source(_source), cid(_id), name(_name) {}
bool operator==(const Device* const dev) const;
void FromDevice(const Device* const dev);
void FromString(const std::string& str);
std::string ToString() const;
std::string source;
int id;
int cid;
std::string name;
};