diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2006-04-07 23:04:59 +0000 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2006-04-07 23:04:59 +0000 |
| commit | 8f9172e2814b98b58fcc2e57cde720e10477b9c1 (patch) | |
| tree | 0b519820735d9be49744f8245e3851ebb4b9d380 | |
| parent | 8541e7775e75cd6ce0fb69ddb8922b6032489441 (diff) | |
Add a DrawablePtr argument to the XV functions to pave the way for
redirected video.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/apm_video.c | 12 |
2 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-04-07 Aaron Plattner <aplattner@nvidia.com> + + * src/apm_video.c: (ReputImage), (PutImage): + Add a DrawablePtr argument to the XV functions to pave the way for + redirected video. + 2006-04-06 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/src/apm_video.c b/src/apm_video.c index 244ab26..acf65da 100644 --- a/src/apm_video.c +++ b/src/apm_video.c @@ -29,10 +29,12 @@ static int ApmQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, unsigned short *, int *, int *); #endif -static int A(ReputImage)(ScrnInfoPtr, short, short, RegionPtr, pointer); +static int A(ReputImage)(ScrnInfoPtr, short, short, RegionPtr, pointer, + DrawablePtr); static int A(PutImage)(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char*, - short, short, Bool, RegionPtr, pointer); + short, short, Bool, RegionPtr, pointer, + DrawablePtr); static void A(ResetVideo)(ScrnInfoPtr); static void A(XvMoveCB)(FBAreaPtr, FBAreaPtr); @@ -510,7 +512,7 @@ static void A(XvRemoveCB)(FBAreaPtr area) static int A(ReputImage)(ScrnInfoPtr pScrn, short drw_x, short drw_y, - RegionPtr clipBoxes, pointer pdata) + RegionPtr clipBoxes, pointer pdata, DrawablePtr pDraw) { ScreenPtr pScreen = pScrn->pScreen; APMDECL(pScrn); @@ -660,7 +662,7 @@ A(PutImage)(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, int id, unsigned char* buf, short width, short height, Bool sync, RegionPtr clipBoxes, - pointer data) + pointer data, DrawablePtr pDraw) { ApmPortPrivPtr pPriv = (ApmPortPrivPtr)data; ScreenPtr pScreen = pScrn->pScreen; @@ -894,7 +896,7 @@ A(PutImage)(ScrnInfoPtr pScrn, short src_x, short src_y, break; } - (void) A(ReputImage)(pScrn, drw_x, drw_y, clipBoxes, data); + (void) A(ReputImage)(pScrn, drw_x, drw_y, clipBoxes, data, pDraw); A(WaitForFifo)(pApm, 1); WRXW(pPriv->reg, pPriv->val); |