diff options
Diffstat (limited to 'source/blender/windowmanager/intern/wm_jobs.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_jobs.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/source/blender/windowmanager/intern/wm_jobs.c b/source/blender/windowmanager/intern/wm_jobs.c index 498306484e9..c2ecf0c59e7 100644 --- a/source/blender/windowmanager/intern/wm_jobs.c +++ b/source/blender/windowmanager/intern/wm_jobs.c @@ -255,7 +255,7 @@ void WM_jobs_start(wmWindowManager *wm, wmJob *steve) /* restarted job has timer already */ if(steve->wt==NULL) - steve->wt= WM_event_add_window_timer(steve->win, TIMERJOBS, steve->timestep); + steve->wt= WM_event_add_timer(wm, steve->win, TIMERJOBS, steve->timestep); } else printf("job fails, not initialized\n"); } @@ -271,7 +271,7 @@ static void wm_jobs_kill_job(wmWindowManager *wm, wmJob *steve) } if(steve->wt) - WM_event_remove_window_timer(steve->win, steve->wt); + WM_event_remove_timer(wm, steve->win, steve->wt); if(steve->customdata) steve->free(steve->customdata); if(steve->run_customdata) @@ -317,14 +317,13 @@ void wm_jobs_timer_ended(wmWindowManager *wm, wmTimer *wt) } /* hardcoded to event TIMERJOBS */ -static int wm_jobs_timer(bContext *C, wmOperator *op, wmEvent *evt) +void wm_jobs_timer(const bContext *C, wmWindowManager *wm, wmTimer *wt) { - wmWindowManager *wm= CTX_wm_manager(C); wmJob *steve= wm->jobs.first; for(; steve; steve= steve->next) { - if(evt->customdata==steve->wt) { + if(steve->wt==wt) { /* running threads */ if(steve->threads.first) { @@ -358,7 +357,7 @@ static int wm_jobs_timer(bContext *C, wmOperator *op, wmEvent *evt) WM_jobs_start(wm, steve); } else { - WM_event_remove_window_timer(steve->win, steve->wt); + WM_event_remove_timer(wm, steve->win, steve->wt); steve->wt= NULL; /* remove steve */ @@ -370,23 +369,7 @@ static int wm_jobs_timer(bContext *C, wmOperator *op, wmEvent *evt) else if(steve->suspended) { WM_jobs_start(wm, steve); } - - return OPERATOR_FINISHED; } } - return OPERATOR_PASS_THROUGH; } -void WM_OT_jobs_timer(wmOperatorType *ot) -{ - /* identifiers */ - ot->name= "Jobs timer"; - ot->idname= "WM_OT_jobs_timer"; - ot->description="Jobs timer operator."; - - /* api callbacks */ - ot->invoke= wm_jobs_timer; - - ot->poll= ED_operator_screenactive; - -} |