Permalink
Browse files

PJ: remove add_check_tflx_toram and rem_check_tflx_toram.

These were originally responsible for automatically moving files
between disk and ram.
  • Loading branch information...
wangds committed Apr 23, 2014
1 parent 94e5463 commit b63d1d862ec6ab45db776e69d58c970e7000e030
Showing with 0 additions and 39 deletions.
  1. +0 −3 src/PJ/auto.c
  2. +0 −2 src/PJ/composmu.c
  3. +0 −30 src/PJ/freem.c
  4. +0 −2 src/PJ/inc/memory.h
  5. +0 −1 src/PJ/multimen.c
  6. +0 −1 src/PJ/tempflx.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);
}
@@ -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)
{
@@ -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();
@@ -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);
@@ -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);
@@ -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);
}

0 comments on commit b63d1d8

Please sign in to comment.