[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49915] trunk/blender/source/blender/ windowmanager/intern: code cleanup: use TRUE/FALSE for wm jobs

[Campbell Barton]

Revision: 49915
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49915
Author:   campbellbarton
Date:     2012-08-15 10:12:41 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
code cleanup: use TRUE/FALSE for wm jobs

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
    trunk/blender/source/blender/windowmanager/intern/wm_jobs.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2012-08-15 10:10:29 UTC (rev 49914)
+++ trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c	2012-08-15 10:12:41 UTC (rev 49915)
@@ -367,19 +367,19 @@
 /* note, doesnt run exit() call WM_exit() for that */
 void WM_exit_ext(bContext *C, const short do_python)
 {
-	wmWindow *win;
+	wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL;
 
 	sound_exit();
 
-
 	/* first wrap up running stuff, we assume only the active WM is running */
 	/* modal handlers are on window level freed, others too? */
 	/* note; same code copied in wm_files.c */
-	if (C && CTX_wm_manager(C)) {
-		
-		WM_jobs_stop_all(CTX_wm_manager(C));
-		
-		for (win = CTX_wm_manager(C)->windows.first; win; win = win->next) {
+	if (C && wm) {
+		wmWindow *win;
+
+		WM_jobs_stop_all(wm);
+
+		for (win = wm->windows.first; win; win = win->next) {
 			
 			CTX_wm_window_set(C, win);  /* needed by operator close callbacks */
 			WM_event_remove_handlers(C, &win->handlers);
@@ -408,7 +408,7 @@
 	
 	ED_preview_free_dbase();  /* frees a Main dbase, before free_blender! */
 
-	if (C && CTX_wm_manager(C))
+	if (C && wm)
 		wm_free_reports(C);  /* before free_blender! - since the ListBases get freed there */
 
 	BKE_sequencer_free_clipboard(); /* sequencer.c */

Modified: trunk/blender/source/blender/windowmanager/intern/wm_jobs.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_jobs.c	2012-08-15 10:10:29 UTC (rev 49914)
+++ trunk/blender/source/blender/windowmanager/intern/wm_jobs.c	2012-08-15 10:12:41 UTC (rev 49915)
@@ -236,7 +236,7 @@
 
 	if (wm_job->running) {
 		/* signal job to end */
-		wm_job->stop = 1;
+		wm_job->stop = TRUE;
 	}
 }
 
@@ -264,7 +264,7 @@
 	wmJob *wm_job = job_v;
 	
 	wm_job->startjob(wm_job->run_customdata, &wm_job->stop, &wm_job->do_update, &wm_job->progress);
-	wm_job->ready = 1;
+	wm_job->ready = TRUE;
 	
 	return NULL;
 }
@@ -273,18 +273,20 @@
 static void wm_jobs_test_suspend_stop(wmWindowManager *wm, wmJob *test)
 {
 	wmJob *wm_job;
-	int suspend = 0;
+	int suspend = FALSE;
 	
 	/* job added with suspend flag, we wait 1 timer step before activating it */
 	if (test->flag & WM_JOB_SUSPEND) {
-		suspend = 1;
+		suspend = TRUE;
 		test->flag &= ~WM_JOB_SUSPEND;
 	}
 	else {
 		/* check other jobs */
 		for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) {
 			/* obvious case, no test needed */
-			if (wm_job == test || !wm_job->running) continue;
+			if (wm_job == test || !wm_job->running) {
+				continue;
+			}
 			
 			/* if new job is not render, then check for same startjob */
 			if (0 == (test->flag & WM_JOB_EXCL_RENDER))
@@ -296,11 +298,11 @@
 				if (0 == (wm_job->flag & WM_JOB_EXCL_RENDER))
 					continue;
 
-			suspend = 1;
+			suspend = TRUE;
 
 			/* if this job has higher priority, stop others */
 			if (test->flag & WM_JOB_PRIORITY) {
-				wm_job->stop = 1;
+				wm_job->stop = TRUE;
 				// printf("job stopped: %s\n", wm_job->name);
 			}
 		}
@@ -317,7 +319,7 @@
 {
 	if (wm_job->running) {
 		/* signal job to end and restart */
-		wm_job->stop = 1;
+		wm_job->stop = TRUE;
 		// printf("job started a running job, ending... %s\n", wm_job->name);
 	}
 	else {
@@ -326,19 +328,19 @@
 			
 			wm_jobs_test_suspend_stop(wm, wm_job);
 			
-			if (wm_job->suspended == 0) {
+			if (wm_job->suspended == FALSE) {
 				/* copy to ensure proper free in end */
 				wm_job->run_customdata = wm_job->customdata;
 				wm_job->run_free = wm_job->free;
 				wm_job->free = NULL;
 				wm_job->customdata = NULL;
-				wm_job->running = 1;
+				wm_job->running = TRUE;
 				
 				if (wm_job->initjob)
 					wm_job->initjob(wm_job->run_customdata);
 				
-				wm_job->stop = 0;
-				wm_job->ready = 0;
+				wm_job->stop = FALSE;
+				wm_job->ready = FALSE;
 				wm_job->progress = 0.0;
 
 				// printf("job started: %s\n", wm_job->name);
@@ -363,7 +365,7 @@
 {
 	if (wm_job->running) {
 		/* signal job to end */
-		wm_job->stop = 1;
+		wm_job->stop = TRUE;
 		BLI_end_threads(&wm_job->threads);
 
 		if (wm_job->endjob)
@@ -400,7 +402,7 @@
 	for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) {
 		if (wm_job->owner == owner || wm_job->startjob == startjob) {
 			if (wm_job->running) {
-				wm_job->stop = 1;
+				wm_job->stop = TRUE;
 			}
 		}
 	}
@@ -483,7 +485,7 @@
 						       PIL_check_seconds_timer() - wm_job->start_time);
 					}
 
-					wm_job->running = 0;
+					wm_job->running = FALSE;
 					BLI_end_threads(&wm_job->threads);
 					
 					if (wm_job->endnote)
@@ -543,9 +545,9 @@
 
 	for (wm_job = wm->jobs.first; wm_job; wm_job = wm_job->next) {
 		if (wm_job->running) {
-			return 1;
+			return TRUE;
 		}
 	}
 
-	return 0;
+	return FALSE;
 }