Attachment #101007 for bug #153747

View | Details | Raw Unified | Return to bug 153747
Collapse All | Expand All

Lines 417-423 Link Here

(-)kvdr.orig/kvdr/ckvdrcfg.cpp (-1 / +1 lines)
417	if(-1!=((Kvdr*)p)->video_fd.handle())	417	if(-1!=((Kvdr*)p)->video_fd.handle())
418	{	418	{
419	((Kvdr)p)->OvlF(((Kvdr)p)->display_width,((Kvdr*)p)->display_height,	419	((Kvdr)p)->OvlF(((Kvdr)p)->display_width,((Kvdr*)p)->display_height,
420	(int)((Kvdr)p)->base,((Kvdr)p)->bpp,((Kvdr*)p)->palette);	420	(long)((Kvdr)p)->base,((Kvdr)p)->bpp,((Kvdr*)p)->palette);
421	((Kvdr)p)->OvlP(((Kvdr)p)->brightness,((Kvdr*)p)->colour,	421	((Kvdr)p)->OvlP(((Kvdr)p)->brightness,((Kvdr*)p)->colour,
422	((Kvdr)p)->hue,((Kvdr)p)->contrast);	422	((Kvdr)p)->hue,((Kvdr)p)->contrast);
423	((Kvdr*)p)->OverlayOnOffSLOT(1);	423	((Kvdr*)p)->OverlayOnOffSLOT(1);




  //Set the Frambuffer and Image properties:
	if (!(args->isSet("x")))
	{
    OvlF(display_width,display_height,(long)base,bpp,palette);
    OvlP(brightness,colour,hue,contrast);
    ovlstat=true;
    setMaximumSize(f_size_x,f_size_y);

       )
    {
    	 fprintf(stderr,"kvdr and v4l-conf disagree about the framebuffer geometry\noverlay will not be shown\n");
       fprintf(stderr,"kvdr: FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",(unsigned long)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
       fprintf(stderr,"v4l : FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);
       ovlFbSet = ovlGeoSet = false;
       ovlClipCount = 0;

	  	return;//should never happen anyway: vid_dev taken away below kvdr
	  }
	}
  OvlF(display_width,display_height,(long)base,bpp,palette);
  OvlP(brightness,colour,hue,contrast);
	OverlayOnOffSLOT(1);
	usleep(20000);//not to fast...

      	video_fd.open(IO_ReadWrite);
      	if( !(args->isSet("x")) )
      	{
          OvlF(display_width,display_height,(long)base,bpp,palette);
          OvlP(brightness,colour,hue,contrast);
      		OverlayOnOffSLOT(1);
        }

Return to bug 153747

Lines 343-349 Link Here

(-)kvdr.orig/kvdr/kvdr.cpp (-4 / +4 lines)
343	//Set the Frambuffer and Image properties:	343	//Set the Frambuffer and Image properties:
344	if (!(args->isSet("x")))	344	if (!(args->isSet("x")))
345	{	345	{
346	OvlF(display_width,display_height,(int)base,bpp,palette);	346	OvlF(display_width,display_height,(long)base,bpp,palette);
347	OvlP(brightness,colour,hue,contrast);	347	OvlP(brightness,colour,hue,contrast);
348	ovlstat=true;	348	ovlstat=true;
349	setMaximumSize(f_size_x,f_size_y);	349	setMaximumSize(f_size_x,f_size_y);
Lines 445-451 Link Here
445	)	445	)
446	{	446	{
447	fprintf(stderr,"kvdr and v4l-conf disagree about the framebuffer geometry\noverlay will not be shown\n");	447	fprintf(stderr,"kvdr and v4l-conf disagree about the framebuffer geometry\noverlay will not be shown\n");
448	fprintf(stderr,"kvdr: FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",(unsigned int)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);	448	fprintf(stderr,"kvdr: FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",(unsigned long)vb.base,vb.depth,vb.height,vb.width,vb.bytesperline);
449	fprintf(stderr,"v4l : FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);	449	fprintf(stderr,"v4l : FbAddr=%x Bpp=%d height=%d width=%d bps=%d\n",FbAddr,Bpp,SizeY,SizeX,(vb.depth+1)/8*vb.width);
450	ovlFbSet = ovlGeoSet = false;	450	ovlFbSet = ovlGeoSet = false;
451	ovlClipCount = 0;	451	ovlClipCount = 0;
Lines 1587-1593 Link Here
1587	return;//should never happen anyway: vid_dev taken away below kvdr	1587	return;//should never happen anyway: vid_dev taken away below kvdr
1588	}	1588	}
1589	}	1589	}
1590	OvlF(display_width,display_height,(int)base,bpp,palette);	1590	OvlF(display_width,display_height,(long)base,bpp,palette);
1591	OvlP(brightness,colour,hue,contrast);	1591	OvlP(brightness,colour,hue,contrast);
1592	OverlayOnOffSLOT(1);	1592	OverlayOnOffSLOT(1);
1593	usleep(20000);//not to fast...	1593	usleep(20000);//not to fast...
Lines 2011-2017 Link Here
2011	video_fd.open(IO_ReadWrite);	2011	video_fd.open(IO_ReadWrite);
2012	if( !(args->isSet("x")) )	2012	if( !(args->isSet("x")) )
2013	{	2013	{
2014	OvlF(display_width,display_height,(int)base,bpp,palette);	2014	OvlF(display_width,display_height,(long)base,bpp,palette);
2015	OvlP(brightness,colour,hue,contrast);	2015	OvlP(brightness,colour,hue,contrast);
2016	OverlayOnOffSLOT(1);	2016	OverlayOnOffSLOT(1);
2017	}	2017	}