diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 09:37:53 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-09 09:37:53 +0000 |
| commit | 0fd6f9301c3d3d568fb58251bb1c38da576701a2 (patch) | |
| tree | 5698f26df6df01068f706a88fe95330b25ddbe23 | |
| parent | c6c9d266fad98310bb6f0118362d8dc7e60ecfae (diff) | |
| download | pcsxr-0fd6f9301c3d3d568fb58251bb1c38da576701a2.tar.gz | |
Future work to get PADhandleKey working on OS X. Still very much a work-in-progress.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85937 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rwxr-xr-x | macosx/Plugin.c | 2 | ||||
| -rwxr-xr-x | macosx/main.m | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/macosx/Plugin.c b/macosx/Plugin.c index e501a5f5..48ff71bc 100755 --- a/macosx/Plugin.c +++ b/macosx/Plugin.c @@ -186,7 +186,7 @@ void ClosePlugins() { if (ret < 0) { SysMessage("%s", _("Error Closing GPU Plugin")); return; } #ifdef ENABLE_SIO1API ret = SIO1_close(); - if (ret < 0) { SysMessage(_("Error closing SIO1 plugin!")); return; } + if (ret < 0) { SysMessage("%s", _("Error closing SIO1 plugin!")); return; } #endif if (Config.UseNet) { diff --git a/macosx/main.m b/macosx/main.m index 76a08abf..537dfc18 100755 --- a/macosx/main.m +++ b/macosx/main.m @@ -207,8 +207,13 @@ void SysCloseLibrary(void *lib) { // Called periodically from the emu thread void SysUpdate() { +#if 0 + PADhandleKey(PAD1_keypressed()); + PADhandleKey(PAD2_keypressed()); +#else PAD1_keypressed(); PAD2_keypressed(); +#endif [emuThread handleEvents]; } |