diff options
| author | Matthew Hoops | 2012-04-02 10:07:45 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-04-02 10:07:45 -0400 |
| commit | b6374a3103787415eaad1eb2ea29559bd4c7d372 (patch) | |
| tree | 05defd71f9cd141917e2c36b7fab215718763063 /backends/platform/iphone/iphone_video.h | |
| parent | 47ae65e49577b1f881c2f5956ad8550f0089a4fe (diff) | |
| parent | d50e34c1bd1152170737bea6bd85c08566426eb6 (diff) | |
| download | scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.tar.gz scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.tar.bz2 scummvm-rg350-b6374a3103787415eaad1eb2ea29559bd4c7d372.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/platform/iphone/iphone_video.h')
| -rw-r--r-- | backends/platform/iphone/iphone_video.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h index 1405fe35f1..6b8c25ebcf 100644 --- a/backends/platform/iphone/iphone_video.h +++ b/backends/platform/iphone/iphone_video.h @@ -34,10 +34,13 @@ #include "iphone_keyboard.h" #include "iphone_common.h" +#include "common/list.h" + @interface iPhoneView : UIView { VideoContext _videoContext; - NSMutableArray *_events; + Common::List<InternalEvent> _events; + NSLock *_eventLock; SoftKeyboard *_keyboardView; EAGLContext *_context; @@ -94,14 +97,14 @@ - (void)updateMouseCursorScaling; - (void)updateMouseCursor; -- (id)getEvent; - - (void)deviceOrientationChanged:(UIDeviceOrientation)orientation; - (void)applicationSuspend; - (void)applicationResume; +- (bool)fetchEvent:(InternalEvent *)event; + @end extern iPhoneView *g_iPhoneViewInstance; |