Mercurial > mplayer.hg
comparison libmenu/vf_menu.c @ 17908:dcfaebcdde14
10l (forgot ...)
author | michael |
---|---|
date | Tue, 21 Mar 2006 22:31:49 +0000 |
parents | 931bdbc37ee0 |
children | 98f4e3704a76 |
comparison
equal
deleted
inserted
replaced
17907:d8a6e0c22f0c | 17908:dcfaebcdde14 |
---|---|
35 struct vf_priv_s { | 35 struct vf_priv_s { |
36 menu_t* root; | 36 menu_t* root; |
37 menu_t* current; | 37 menu_t* current; |
38 }; | 38 }; |
39 | 39 |
40 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi); | 40 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts); |
41 | 41 |
42 static mp_image_t* alloc_mpi(int w, int h, uint32_t fmt) { | 42 static mp_image_t* alloc_mpi(int w, int h, uint32_t fmt) { |
43 mp_image_t* mpi = new_mp_image(w,h); | 43 mp_image_t* mpi = new_mp_image(w,h); |
44 | 44 |
45 mp_image_setfmt(mpi,fmt); | 45 mp_image_setfmt(mpi,fmt); |
74 return mpi; | 74 return mpi; |
75 } | 75 } |
76 | 76 |
77 void vf_menu_pause_update(struct vf_instance_s* vf) { | 77 void vf_menu_pause_update(struct vf_instance_s* vf) { |
78 if(pause_mpi) { | 78 if(pause_mpi) { |
79 put_image(vf,pause_mpi); | 79 put_image(vf,pause_mpi, MP_NOPTS_VALUE); |
80 // Don't draw the osd atm | 80 // Don't draw the osd atm |
81 //vf->control(vf,VFCTRL_DRAW_OSD,NULL); | 81 //vf->control(vf,VFCTRL_DRAW_OSD,NULL); |
82 video_out->flip_page(); | 82 video_out->flip_page(); |
83 } | 83 } |
84 } | 84 } |
167 } | 167 } |
168 } | 168 } |
169 | 169 |
170 | 170 |
171 | 171 |
172 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ | 172 static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ |
173 mp_image_t *dmpi = NULL; | 173 mp_image_t *dmpi = NULL; |
174 | 174 |
175 if(vf->priv->current->show | 175 if(vf->priv->current->show |
176 || (vf->priv->current->parent && vf->priv->current->parent->show)) { | 176 || (vf->priv->current->parent && vf->priv->current->parent->show)) { |
177 // Close all menu who requested it | 177 // Close all menu who requested it |
229 dmpi->planes[0] = mpi->planes[0]; | 229 dmpi->planes[0] = mpi->planes[0]; |
230 dmpi->planes[1] = mpi->planes[1]; | 230 dmpi->planes[1] = mpi->planes[1]; |
231 dmpi->planes[2] = mpi->planes[2]; | 231 dmpi->planes[2] = mpi->planes[2]; |
232 dmpi->priv = mpi->priv; | 232 dmpi->priv = mpi->priv; |
233 } | 233 } |
234 return vf_next_put_image(vf,dmpi); | 234 return vf_next_put_image(vf,dmpi, pts); |
235 } | 235 } |
236 | 236 |
237 static void uninit(vf_instance_t *vf) { | 237 static void uninit(vf_instance_t *vf) { |
238 vf->priv=NULL; | 238 vf->priv=NULL; |
239 if(pause_mpi) { | 239 if(pause_mpi) { |