PJ: remove add_check_tflx_toram and rem_check_tflx_toram.

wangds · wangds · commit b63d1d862ec6 · 2014-04-23T11:00:34.000+10:00
These were originally responsible for automatically moving files
between disk and ram.
diff --git a/src/PJ/auto.c b/src/PJ/auto.c
@@ -725,7 +725,6 @@ void auto_setup(Autoarg *aa)
 
 /* undo stuff and common setup stuff before executing auto drawer */
 {
-	rem_check_tflx_toram();
 	flx_clear_olays();
 	if(aa->flags & AUTO_HIDEMP)
 		hide_mp();
@@ -795,8 +794,6 @@ Errcode auto_restores(Autoarg *aa,Errcode err)
 		show_mp();
 	set_abort_verify(NULL, NULL);
 	flx_draw_olays();
-	if(!aa->in_preview)
-		add_check_tflx_toram();
 	see_cmap();  /* some error cases may not sync colormap! */
 	return(err);
 }
diff --git a/src/PJ/composmu.c b/src/PJ/composmu.c
@@ -848,8 +848,6 @@ void *ss;
 early_error:
 	smu_free_scatters(&ss);
 	softerr(err,"join_menu");
-	add_check_tflx_toram();
-	return;
 }
 void qdo_composite(void)
 {
diff --git a/src/PJ/freem.c b/src/PJ/freem.c
@@ -229,36 +229,6 @@ set_trd_maxmem(void)
 
 /*** checker "task" called from within input loop installed by doauto() ***/
 
-static Waitask trdtask;
-
-static int trdtask_func(Waitask *wt)
-{
-	(void)wt;
-
-	if(pushed_mask > 0  	   /* wait till all is popped */
-		|| pushed_alt > 0 
-		|| pushed_cel > 0
-		|| pushed_mask > 0
-		|| flix.xf == NULL     /* wait till file is open */
-		|| cgroup_hidden(vb.screen) /* wait till menus are shown */
-		|| zoom_hidden()) /* wait till rezoomed */
-	{
-		return(0);
-	}
-
-	return(TRUE); /* done with it */
-}
-void rem_check_tflx_toram(void)
-{
-	rem_waitask(&trdtask);
-}
-void add_check_tflx_toram(void)
-{
-	if(WT_ISATTACHED(&trdtask))
-		return;
-	init_waitask(&trdtask,trdtask_func,NULL,WT_KILLCURSOR);
-	add_waitask(&trdtask);
-}
 void pop_most(void)
 {
 	grab_uvfont();
diff --git a/src/PJ/inc/memory.h b/src/PJ/inc/memory.h
@@ -108,8 +108,6 @@ extern Errcode pop_cel(void);
 extern Errcode push_most(void);
 extern Errcode push_pics_id(LONG time_id);
 extern void set_trd_maxmem(void);
-extern void rem_check_tflx_toram(void);
-extern void add_check_tflx_toram(void);
 extern void pop_most(void);
 extern void maybe_push_most(void);
 extern void maybe_pop_most(void);
diff --git a/src/PJ/multimen.c b/src/PJ/multimen.c
@@ -461,7 +461,6 @@ static Button *disabtab[] = {
 	menu_to_cursor(vb.screen, &mum_menu);
 	err = do_reqloop(vb.screen,&mum_menu,NULL,NULL,NULL);
 	vl.undoit = oundo;
-	add_check_tflx_toram(); /* something here may have forced it out */
 
 error:
 	smu_free_scatters(&ss);
diff --git a/src/PJ/tempflx.c b/src/PJ/tempflx.c
@@ -115,7 +115,6 @@ void flush_tflx(void)
 }
 void close_tflx(void)
 {
-	rem_check_tflx_toram(); /* fudgy but this will take it out */
 	vs.frame_ix = 0;
 	close_flx(&flix);
 }

Original file line number	Diff line number	Diff line change
`@@ -848,8 +848,6 @@ void *ss;`
`848`	`848`	`early_error:`
`849`	`849`	`smu_free_scatters(&ss);`
`850`	`850`	`softerr(err,"join_menu");`
`851`		`- add_check_tflx_toram();`
`852`		`- return;`
`853`	`851`	`}`
`854`	`852`	`void qdo_composite(void)`
`855`	`853`	`{`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,6 @@ void flush_tflx(void)`
`115`	`115`	`}`
`116`	`116`	`void close_tflx(void)`
`117`	`117`	`{`
`118`		`- rem_check_tflx_toram(); /* fudgy but this will take it out */`
`119`	`118`	`vs.frame_ix = 0;`
`120`	`119`	`close_flx(&flix);`
`121`	`120`	`}`