Mercurial > sdl-ios-xcode
diff src/video/Xext/Xv/Xv.c @ 1575:3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Wed, 22 Mar 2006 05:00:59 +0000 |
| parents | 6fd39b50dd91 |
| children | ecba4bbaf9c2 |
line wrap: on
line diff
--- a/src/video/Xext/Xv/Xv.c Wed Mar 22 04:51:44 2006 +0000 +++ b/src/video/Xext/Xv/Xv.c Wed Mar 22 05:00:59 2006 +0000 @@ -121,7 +121,7 @@ XvGetReq(QueryExtension, req); - if (!p_XReply(dpy, (xReply *)&rep, 0, xFalse)) { + if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { UnlockDisplay(dpy); SyncHandle(); return XvBadExtension; @@ -171,7 +171,7 @@ /* READ THE REPLY */ - if (p_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { + if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { UnlockDisplay(dpy); SyncHandle(); return(XvBadReply); @@ -183,7 +183,7 @@ SyncHandle(); return(XvBadAlloc); } - p_XRead (dpy, buffer, size); + _XRead (dpy, buffer, size); u.buffer = buffer; @@ -330,7 +330,7 @@ /* READ THE REPLY */ - if (p_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { + if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { UnlockDisplay(dpy); SyncHandle(); return(XvBadReply); @@ -342,7 +342,7 @@ SyncHandle(); return(XvBadAlloc); } - p_XRead (dpy, buffer, size); + _XRead (dpy, buffer, size); u.buffer = buffer; @@ -617,7 +617,7 @@ req->port = port; req->time = time; - if (p_XReply (dpy, (xReply *) &rep, 0, xTrue) == 0) + if (_XReply (dpy, (xReply *) &rep, 0, xTrue) == 0) rep.result = GrabSuccess; result = rep.result; @@ -745,7 +745,7 @@ /* READ THE REPLY */ - if (p_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { + if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { UnlockDisplay(dpy); SyncHandle(); return(XvBadReply); @@ -790,7 +790,7 @@ /* READ THE REPLY */ - if (p_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { + if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { UnlockDisplay(dpy); SyncHandle(); return(XvBadReply); @@ -825,7 +825,7 @@ /* READ THE REPLY */ - if (p_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { + if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { UnlockDisplay(dpy); SyncHandle(); return ret; @@ -840,17 +840,17 @@ int i; for(i = 0; i < rep.num_attributes; i++) { - p_XRead(dpy, (char*)(&Info), sz_xvAttributeInfo); + _XRead(dpy, (char*)(&Info), sz_xvAttributeInfo); ret[i].flags = (int)Info.flags; ret[i].min_value = Info.min; ret[i].max_value = Info.max; ret[i].name = marker; - p_XRead(dpy, marker, Info.size); + _XRead(dpy, marker, Info.size); marker += Info.size; (*num)++; } } else - p_XEatData(dpy, rep.length << 2); + _XEatData(dpy, rep.length << 2); } UnlockDisplay(dpy); @@ -880,7 +880,7 @@ /* READ THE REPLY */ - if (p_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { + if (_XReply(dpy, (xReply *)&rep, 0, xFalse) == 0) { UnlockDisplay(dpy); SyncHandle(); return NULL; @@ -894,7 +894,7 @@ int i; for(i = 0; i < rep.num_formats; i++) { - p_XRead(dpy, (char*)(&Info), sz_xvImageFormatInfo); + _XRead(dpy, (char*)(&Info), sz_xvImageFormatInfo); ret[i].id = Info.id; ret[i].type = Info.type; ret[i].byte_order = Info.byte_order; @@ -920,7 +920,7 @@ (*num)++; } } else - p_XEatData(dpy, rep.length << 2); + _XEatData(dpy, rep.length << 2); } UnlockDisplay(dpy); @@ -954,7 +954,7 @@ /* READ THE REPLY */ - if (!p_XReply(dpy, (xReply *)&rep, 0, xFalse)) { + if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { UnlockDisplay(dpy); SyncHandle(); return NULL; @@ -970,10 +970,10 @@ ret->offsets = ret->pitches + rep.num_planes; ret->data = data; ret->obdata = NULL; - p_XRead(dpy, (char*)(ret->pitches), rep.num_planes << 2); - p_XRead(dpy, (char*)(ret->offsets), rep.num_planes << 2); + _XRead(dpy, (char*)(ret->pitches), rep.num_planes << 2); + _XRead(dpy, (char*)(ret->offsets), rep.num_planes << 2); } else - p_XEatData(dpy, rep.length << 2); + _XEatData(dpy, rep.length << 2); UnlockDisplay(dpy); SyncHandle(); @@ -1122,7 +1122,7 @@ case XvVideoNotify: re->xvvideo.type = event->u.u.type & 0x7f; re->xvvideo.serial = - p_XSetLastRequestRead(dpy, (xGenericReply *)event); + _XSetLastRequestRead(dpy, (xGenericReply *)event); re->xvvideo.send_event = ((event->u.u.type & 0x80) != 0); re->xvvideo.display = dpy; re->xvvideo.time = event->u.videoNotify.time; @@ -1133,7 +1133,7 @@ case XvPortNotify: re->xvport.type = event->u.u.type & 0x7f; re->xvport.serial = - p_XSetLastRequestRead(dpy, (xGenericReply *)event); + _XSetLastRequestRead(dpy, (xGenericReply *)event); re->xvport.send_event = ((event->u.u.type & 0x80) != 0); re->xvport.display = dpy; re->xvport.time = event->u.portNotify.time;