summaryrefslogtreecommitdiff
path: root/src/z4l.c
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2012-07-21 12:36:51 +0200
committerMart Raudsepp <leio@gentoo.org>2012-07-26 07:38:56 +0300
commita83fcb6f84995dc50b8adffc27e264a663fbd606 (patch)
tree9e12ca73eb670f18f703a08b5061b951b0789f7a /src/z4l.c
parent68646c3119a69a8391a49f2d565672d73829e2c9 (diff)
Initial stab at converting geode to new X1.13 API
Preparing to compile geode on X 1.13 All compiler errors are gone as far as I can tell, but I lack the hardware to verify it works as well.
Diffstat (limited to 'src/z4l.c')
-rw-r--r--src/z4l.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/z4l.c b/src/z4l.c
index 6388e00..eccefe8 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -47,6 +47,8 @@
#include "xf86xv.h"
#include "fourcc.h"
+#include "compat-api.h"
+
#define __s64 __s_64
typedef long long __s64;
@@ -1271,19 +1273,20 @@ Z4lGetPortAttribute(ScrnInfoPtr pScrni, Atom attribute, INT32 *value,
return Success;
}
-static void (*oldAdjustFrame) (int scrnIndex, int x, int y, int flags) = NULL;
+static void (*oldAdjustFrame) (ADJUST_FRAME_ARGS_DECL) = NULL;
static void
-Z4lAdjustFrame(int scrnIndex, int x, int y, int flags)
+Z4lAdjustFrame(ADJUST_FRAME_ARGS_DECL)
{
+ SCRN_INFO_PTR(arg);
int i;
XF86VideoAdaptorPtr adpt;
Z4lPortPrivRec *pPriv;
- DBLOG(3, "Z4lAdjustFrame(%d,%d,%d)\n", x, y, flags);
+ DBLOG(3, "Z4lAdjustFrame(%d,%d)\n", x, y);
z4l_x_offset = x;
z4l_y_offset = y;
- oldAdjustFrame(scrnIndex, x, y, flags);
+ oldAdjustFrame(ADJUST_FRAME_ARGS(x, y));
/* xv adjust does not handle putvideo case */
for (i = 0; i < Z4l_nAdaptors; ++i) {