Mercurial > mplayer.hg
changeset 10839:0f2182b3261f
hopefully final xv ports.
from Jim Hawkins <mplayer@jawkins.com>
| author | attila |
|---|---|
| date | Sun, 07 Sep 2003 18:58:56 +0000 |
| parents | 6a96649b235f |
| children | 10f45897d653 |
| files | libvo/vo_xv.c |
| diffstat | 1 files changed, 20 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_xv.c Sun Sep 07 18:15:47 2003 +0000 +++ b/libvo/vo_xv.c Sun Sep 07 18:58:56 2003 +0000 @@ -623,15 +623,26 @@ } /* check adaptors */ - if(xv_port >= ai[0].num_ports || xv_port < 0) // FIXME: ai[0] should not be hardcoded - { - mp_msg(MSGT_VO, MSGL_WARN,"Xv: Invalid port parameter, overriding with port 0\n"); - xv_port = 0; - } - if (xv_port) - { - if (XvGrabPort(mDisplay, xv_port, CurrentTime)) - xv_port = 0; + if (xv_port) { + int port_found; + + for (port_found = 0, i = 0; !port_found && i < adaptors; i++) { + if ((ai[i].type & XvInputMask) && (ai[i].type & XvImageMask)) { + for (xv_p = ai[i].base_id; xv_p < ai[i].base_id+ai[i].num_ports; ++xv_p) { + if (xv_p == xv_port) { + port_found = 1; + break; + } + } + } + } + if (port_found) { + if (XvGrabPort(mDisplay, xv_port, CurrentTime)) + xv_port = 0; + } else { + mp_msg(MSGT_VO, MSGL_WARN,"Xv: Invalid port parameter, overriding with port 0\n"); + xv_port = 0; + } } for (i = 0; i < adaptors && xv_port == 0; i++){