ports/58531: multimedia/mplayer: bktr input doesn't work [patch]

[Simun Mikecin]

The following reply was made to PR ports/58531; it has been noted by GNATS.

From: Simun Mikecin <sime at logos.hr>
To: freebsd-gnats-submit at FreeBSD.org, amistry at am-productions.biz,
	riggs at rrr.de, sime at logos.hr
Cc:  
Subject: Re: ports/58531: multimedia/mplayer: bktr input doesn't work [patch]
Date: Thu, 27 Nov 2003 23:31:24 +0100

 In the meantime I found what was the problem: in 0.92 version of mplayer 
 variable that holds frames-per-second is of type float, but ioctl for 
 bktr device expects u_short.
 
 This is a fix for this problem:
 
 --- libmpdemux/tvi_bsdbt848.c.orig      Thu Nov 27 22:53:13 2003
 +++ libmpdemux/tvi_bsdbt848.c   Thu Nov 27 23:03:05 2003
 @@ -287,6 +287,7 @@
 
      case TVI_CONTROL_TUN_SET_NORM:
          {
 +        u_short tmp_fps;
          int req_mode = (int)*(void **)arg;
 
          priv->iformat = METEOR_FMT_AUTOMODE;
 @@ -352,11 +353,18 @@
              return(0);
              }
 
 -        if(ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0)
 +        tmp_fps=priv->fps;
 +        if(ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
              {
              perror("fps:ioctl");
              return(0);
              }
 +       //set audioid after norm has been set
 +       if(priv->tunerready == TRUE &&
 ...skipping...
 +           }
 
          return(TVI_CONTROL_TRUE);
          }
 @@ -453,6 +461,7 @@
  {
  int marg;
  int count;
 +u_short tmp_fps;
 
  G_private = priv; /* Oooh, sick */
 
 @@ -497,8 +506,9 @@
      perror("SINPUT:ioctl");
      }
 
 +tmp_fps=priv->fps;
  if(priv->videoready == TRUE &&
 -   ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0)
 +   ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
      {
      perror("SFPS:ioctl");
      }