diff options
| author | Eric Anholt <eric@anholt.net> | 2014-04-04 18:01:07 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-08-06 20:12:20 -0700 |
| commit | 4a095902a37cb98d7954d0873dcf1376cbab54b8 (patch) | |
| tree | c87ecec041dc013709ad8ea02449bc1e927c893d /Xext | |
| parent | e7dde86f2343832c52ef74f5c4fe44a72054c79b (diff) | |
xv: Drop unused XvdiPreemptVideo().
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/xvdix.h | 1 | ||||
| -rw-r--r-- | Xext/xvmain.c | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/Xext/xvdix.h b/Xext/xvdix.h index 2437eb4a6..ddd8abbb5 100644 --- a/Xext/xvdix.h +++ b/Xext/xvdix.h @@ -259,7 +259,6 @@ extern _X_EXPORT int XvdiSelectPortNotify(ClientPtr, XvPortPtr, BOOL); extern _X_EXPORT int XvdiSetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32); extern _X_EXPORT int XvdiGetPortAttribute(ClientPtr, XvPortPtr, Atom, INT32 *); extern _X_EXPORT int XvdiStopVideo(ClientPtr, XvPortPtr, DrawablePtr); -extern _X_EXPORT int XvdiPreemptVideo(ClientPtr, XvPortPtr, DrawablePtr); extern _X_EXPORT int XvdiMatchPort(XvPortPtr, DrawablePtr); extern _X_EXPORT int XvdiGrabPort(ClientPtr, XvPortPtr, Time, int *); extern _X_EXPORT int XvdiUngrabPort(ClientPtr, XvPortPtr, Time); diff --git a/Xext/xvmain.c b/Xext/xvmain.c index 9084e40f3..ea3771f9b 100644 --- a/Xext/xvmain.c +++ b/Xext/xvmain.c @@ -992,28 +992,6 @@ XvdiStopVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw) } int -XvdiPreemptVideo(ClientPtr client, XvPortPtr pPort, DrawablePtr pDraw) -{ - int status; - - /* IF PORT ISN'T ACTIVE THEN WE'RE DONE */ - - if (!pPort->pDraw || (pPort->pDraw != pDraw)) - return Success; - - XvdiSendVideoNotify(pPort, pPort->pDraw, XvPreempted); - - status = (*pPort->pAdaptor->ddStopVideo) (client, pPort, pPort->pDraw); - - pPort->pDraw = NULL; - pPort->client = (ClientPtr) client; - pPort->time = currentTime; - - return status; - -} - -int XvdiMatchPort(XvPortPtr pPort, DrawablePtr pDraw) { |