summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dxr3/dxr3_video_out.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/src/dxr3/dxr3_video_out.c b/src/dxr3/dxr3_video_out.c
index 25effa1f3..b341c8a2c 100644
--- a/src/dxr3/dxr3_video_out.c
+++ b/src/dxr3/dxr3_video_out.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_video_out.c,v 1.12 2002/04/02 13:31:03 mlampard Exp $
+ * $Id: dxr3_video_out.c,v 1.13 2002/04/02 14:05:59 mlampard Exp $
*
* mpeg1 encoding video out plugin for the dxr3.
*
@@ -210,8 +210,8 @@ static void dxr3_update_frame_format (vo_driver_t *this_gen,
dxr3_frame_t *frame = (dxr3_frame_t *) frame_gen;
int image_size, oheight;
- if(this->overlay_enabled)
- dxr3_redraw_needed((vo_driver_t *)this);
+ /* update the overlay window co-ords if required */
+ dxr3_redraw_needed((vo_driver_t *)this);
/* reset the copy calls counter (number of calls to dxr3_frame_copy) */
frame->copy_calls = 0;
@@ -405,20 +405,21 @@ int dxr3_redraw_needed(vo_driver_t *this_gen)
dxr3_driver_t *this = (dxr3_driver_t *) this_gen;
int gui_win_x, gui_win_y, gypos,gxpos,gw,gh;
- this->frame_output_cb (this->user_data,
+ if(this->overlay_enabled){
+ this->frame_output_cb (this->user_data,
this->video_width, this->video_height,
&gxpos, &gypos, &gw, &gh,
&gui_win_x, &gui_win_y );
- if(this->xpos!=gxpos || this->ypos!=gypos ||
- this->width !=gw || this->height!=gh) {
- this->xpos=gxpos+1;
- this->ypos=gypos+1;
- this->width=gw;
- this->height=gh;
- dxr3_overlay_adapt_area(this, this->xpos, this->ypos, this->width, this->height, gui_win_x, gui_win_y);
+ if(this->xpos!=gxpos || this->ypos!=gypos ||
+ this->width !=gw || this->height!=gh) {
+ this->xpos=gxpos+1;
+ this->ypos=gypos+1;
+ this->width=gw;
+ this->height=gh;
+ dxr3_overlay_adapt_area(this, this->xpos, this->ypos, this->width, this->height, gui_win_x, gui_win_y);
+ }
}
-
if (this->need_redraw) {
this->need_redraw = 0;
return 1;