hmn
/
orca
5
Fork 2
Code Issues 21 Pull Requests 1 Packages Projects Releases Wiki Activity

remove CVDisplayLink during live resize (causing threading issues)

This commit is contained in:
Martin Fouilleul 2022-08-16 00:00:20 +02:00
parent beffc60634
commit 4ca01db7e8
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/osx_app.mm
View File

@ -174,8 +174,6 @@ struct mp_app_data
mp_live_resize_callback liveResizeCallback; mp_live_resize_callback liveResizeCallback;
void* liveResizeData; void* liveResizeData;
CVDisplayLinkRef displayLink;
mp_frame_stats frameStats; mp_frame_stats frameStats;
NSTimer* frameTimer; NSTimer* frameTimer;
@ -855,12 +853,12 @@ static void mp_queue_event(mp_event* event)
-(void)windowWillStartLiveResize:(NSNotification *)notification -(void)windowWillStartLiveResize:(NSNotification *)notification
{ {
CVDisplayLinkStart(__mpAppData.displayLink); //TODO
} }
-(void)windowDidEndLiveResize:(NSNotification *)notification -(void)windowDidEndLiveResize:(NSNotification *)notification
{ {
CVDisplayLinkStop(__mpAppData.displayLink); //TODO
} }
- (void)windowWillClose:(NSNotification *)notification - (void)windowWillClose:(NSNotification *)notification
@ -1347,7 +1345,7 @@ f64 mp_get_elapsed_seconds()
return(1.e-9*(f64)mp_get_elapsed_nanoseconds()); return(1.e-9*(f64)mp_get_elapsed_nanoseconds());
} }
*/ */
/*
CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink,
const CVTimeStamp *inNow, const CVTimeStamp *inNow,
const CVTimeStamp *inOutputTime, const CVTimeStamp *inOutputTime,
@ -1365,7 +1363,7 @@ CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink,
return(0); return(0);
} }
*/
//*************************************************************** //***************************************************************
// public API // public API
@ -1408,10 +1406,11 @@ void mp_init()
LOG_MESSAGE("run application\n"); LOG_MESSAGE("run application\n");
[NSApp run]; [NSApp run];
/*TODO: maybe some day send frame events during live resize, without breaking everyting...
CGDirectDisplayID displayID = CGMainDisplayID(); CGDirectDisplayID displayID = CGMainDisplayID();
CVDisplayLinkCreateWithCGDisplay(displayID, &__mpAppData.displayLink); CVDisplayLinkCreateWithCGDisplay(displayID, &__mpAppData.displayLink);
CVDisplayLinkSetOutputCallback(__mpAppData.displayLink, DisplayLinkCallback, 0); CVDisplayLinkSetOutputCallback(__mpAppData.displayLink, DisplayLinkCallback, 0);
*/
[NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
[NSApp activateIgnoringOtherApps:YES]; [NSApp activateIgnoringOtherApps:YES];