mirror of
https://github.com/ogoguel/activegs-ios.git
synced 2024-09-27 17:54:43 +00:00
Fix SetVideoFX not being called from the mainthread
This commit is contained in:
parent
79ef40e872
commit
da55e8a888
@ -133,6 +133,7 @@ enum
|
|||||||
-(void)resetSpecialKeys;
|
-(void)resetSpecialKeys;
|
||||||
-(void)unloadSpecialKeys;
|
-(void)unloadSpecialKeys;
|
||||||
- (void) animateDisk:(id)_id ;
|
- (void) animateDisk:(id)_id ;
|
||||||
|
-(void) animateDiskEjection:(id)_id;
|
||||||
-(void)refreshControls:(id)sender;
|
-(void)refreshControls:(id)sender;
|
||||||
- (void) detectHardwareKeyboard:(id)_id ;
|
- (void) detectHardwareKeyboard:(id)_id ;
|
||||||
- (void)setLoading:(NSNumber*)_nsvisible;
|
- (void)setLoading:(NSNumber*)_nsvisible;
|
||||||
|
@ -70,12 +70,14 @@ void x_notify_eject()
|
|||||||
@autoreleasepool {
|
@autoreleasepool {
|
||||||
[[pManager getEmulatorView].kbdc performSelectorOnMainThread:@selector(animateDiskEjection:) withObject:nil waitUntilDone:NO];
|
[[pManager getEmulatorView].kbdc performSelectorOnMainThread:@selector(animateDiskEjection:) withObject:nil waitUntilDone:NO];
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void x_set_video_fx(videofxenum _vfx)
|
void x_set_video_fx(videofxenum _vfx)
|
||||||
{
|
{
|
||||||
[pManager getEmulatorView].zv.crt.hidden = (_vfx==VIDEOFX_CRT?0:1);
|
@autoreleasepool {
|
||||||
|
[[pManager getEmulatorView] performSelectorOnMainThread:@selector(setVideoFx:) withObject:[NSNumber numberWithInt:_vfx] waitUntilDone:NO];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -69,6 +69,7 @@ enum attachMode
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
-(void) updateView;
|
-(void) updateView;
|
||||||
|
-(void)setVideoFx: (NSNumber*)_vfxNumber;
|
||||||
|
|
||||||
@property (nonatomic, strong) customView* contentView;
|
@property (nonatomic, strong) customView* contentView;
|
||||||
@property (nonatomic, strong) zoomEmulatorView* zv;
|
@property (nonatomic, strong) zoomEmulatorView* zv;
|
||||||
|
@ -672,10 +672,13 @@ int x_lock_zoom = 0;
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)dealloc {
|
- (void)dealloc {
|
||||||
|
|
||||||
self.zv;
|
|
||||||
self.zv = nil;
|
self.zv = nil;
|
||||||
|
}
|
||||||
|
|
||||||
|
- (void)setVideoFx: (NSNumber*)_vfxNumber
|
||||||
|
{
|
||||||
|
int vfx = [_vfxNumber intValue];
|
||||||
|
self.zv.crt.hidden = (vfx==VIDEOFX_CRT?0:1);
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
Loading…
Reference in New Issue
Block a user