diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-12-15 21:07:55 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2012-12-15 21:07:55 +0000 |
| commit | be3d963074ee8adf5da0371761e090488b3681d3 (patch) | |
| tree | 24ac0f45405136899584fe3ef2c022c148bfb352 /macosx/plugins/DFXVideo | |
| parent | c0cba1977a8cac317af37c3004c53417fbce31bc (diff) | |
| download | pcsxr-be3d963074ee8adf5da0371761e090488b3681d3.tar.gz | |
Mac Patch 13437.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81770 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/plugins/DFXVideo')
| -rw-r--r-- | macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h | 6 | ||||
| -rw-r--r-- | macosx/plugins/DFXVideo/macsrc/drawgl.m | 3 |
3 files changed, 10 insertions, 3 deletions
diff --git a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj index 794a2cc9..387d04cc 100644 --- a/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj +++ b/macosx/plugins/DFXVideo/PeopsSoftGPU.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 0271796B1678A767004AED62 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = ../../ExtendedKeys.h; sourceTree = "<group>"; }; 28586CC814651E9B0082B8EC /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NetSfPeopsSoftGPUConfig.xib; sourceTree = "<group>"; }; 28586CCA14651EAB0082B8EC /* NetSfPeopsSoftGPUInterface.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NetSfPeopsSoftGPUInterface.xib; sourceTree = "<group>"; }; 2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; @@ -39,7 +40,6 @@ 2B3E5DF0062B36FB001D796E /* PluginWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindowController.h; path = macsrc/PluginWindowController.h; sourceTree = SOURCE_ROOT; }; 2B3E5DF1062B36FB001D796E /* PluginWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindowController.m; path = macsrc/PluginWindowController.m; sourceTree = SOURCE_ROOT; }; 2B51949E06B3D2D200744730 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; - 2B57868106BE7B3700BBA288 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = SOURCE_ROOT; }; 2B957EAE0635DFE400543905 /* PluginWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindow.h; path = macsrc/PluginWindow.h; sourceTree = SOURCE_ROOT; }; 2B957EAF0635DFE400543905 /* PluginWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindow.m; path = macsrc/PluginWindow.m; sourceTree = SOURCE_ROOT; }; 2B959E4306342D32000F2A2D /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; }; @@ -118,6 +118,7 @@ 2BD2E2F40779F50B00657C69 /* macsrc */ = { isa = PBXGroup; children = ( + 0271796B1678A767004AED62 /* ExtendedKeys.h */, 2BB260A60777462E00F6854C /* PluginConfigController.h */, 2BB260A70777462E00F6854C /* PluginConfigController.m */, 2B3E5DF0062B36FB001D796E /* PluginWindowController.h */, @@ -127,7 +128,6 @@ 2BAF4FC90632967A00DB9A16 /* PluginGLView.h */, 2BAF4FCA0632967A00DB9A16 /* PluginGLView.m */, 2B3E5D64062B2CC1001D796E /* drawgl.m */, - 2B57868106BE7B3700BBA288 /* ExtendedKeys.h */, 5555E0CA160695BF00C0A310 /* SGPUPreferences.h */, ); name = macsrc; diff --git a/macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h b/macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h index 1b6475b8..24f54912 100644 --- a/macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h +++ b/macosx/plugins/DFXVideo/macsrc/ExtendedKeys.h @@ -17,7 +17,11 @@ enum { PSX_STOP_KEY = 0xFF1B/*XK_Escape*/, GPU_FULLSCREEN_KEY = 0x0100, - GPU_FPS_DISPLAY_KEY = 0xFFFF/*XK_Delete*/ + GPU_FPS_DISPLAY_KEY = 0xFFFF,/*XK_Delete*/ + + // Fake HotKeys + GPU_HOTKEYS = 0x020, + GPU_FAST_FORWARD }; #endif //__EXTENDED_KEYS_H__ diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m index 18d3762a..be679143 100644 --- a/macosx/plugins/DFXVideo/macsrc/drawgl.m +++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m @@ -175,6 +175,9 @@ void ShowTextGpuPic(void) void HandleKey(int keycode) { switch (keycode) { + case GPU_FAST_FORWARD: + UseFrameLimit ^= 1; + break; case GPU_FULLSCREEN_KEY: [gameController setFullscreen:![gameController fullscreen]]; break; |