[PATCH 06/16] xv: Drop unused XvdiPreemptVideo().

Eric Anholt eric at anholt.net
Fri Jul 18 10:32:23 PDT 2014


Signed-off-by: Eric Anholt <eric at anholt.net>
---
 Xext/xvdix.h  |  1 -
 Xext/xvmain.c | 22 ----------------------
 2 files changed, 23 deletions(-)

diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 2437eb4..ddd8abb 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 70edc93..c048d8f 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)
 {
 
-- 
2.0.1



More information about the xorg-devel mailing list