Changeset 82ca50d33fc3342f74fb4c26fe09f60ae079c7ea

Timestamp:

21/01/08 17:30:36 (9 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1200933036 +0000

git-parent:

[36d62b40229738ff1bcc1ced472cc06a2e25c686]

git-author:

Rafaël Carré <funman@videolan.org> 1200933036 +0000

Message:

fix #1387 (update to new libcaca api)

Files:

• configure.ac (modified) (1 diff)
• modules/video_output/caca.c (modified) (3 diffs)

configure.ac

@@ -4632 +4632 @@
-    VLC_ADD_CFLAGS([caca],[`${CACA_CONFIG} --cflags`])
-    VLC_ADD_LIBS([caca],[`${CACA_CONFIG} --plugin-libs`])
+    AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <caca.h>
+                                        caca_event_t ev;]],
+                                        [[ev.type = 0;]]
+                       )],
+                       [],
+      [AC_DEFINE(CACA_EVENT_OPAQUE, [1], ["Define if struct caca_event is opaque and must not be accessed directly"])]
+    )
-  fi
-fi

modules/video_output/caca.c

@@ -305 +305 @@
-
-#ifdef CACA_API_VERSION_1
+#ifdef CACA_EVENT_OPAQUE
+        switch( caca_get_event_type( &ev ) )
+#else
-        switch( ev.type )
+#endif /* CACA_EVENT_OPAQUE */
-#else
-        switch( ev )
@@ -312 +316 @@
-        case CACA_EVENT_KEY_RELEASE:
-#ifdef CACA_API_VERSION_1
+#ifdef CACA_EVENT_OPAQUE
+            switch( caca_get_event_key_ch( &ev ) )
+#else
-            switch( ev.data.key.ch )
+#endif /* CACA_EVENT_OPAQUE */
-#else
-            switch( ev & 0x00ffffff )
@@ -335 +343 @@
-#ifdef CACA_API_VERSION_1
-        case  CACA_EVENT_MOUSE_MOTION:
-
+
+
+
+
+
+
+
-                         / cucul_get_canvas_width( p_vout->p_sys->p_cv );
-            var_Set( p_vout, "mouse-x", val );
-
+
+
+
+
+
+
+
-                         / cucul_get_canvas_height( p_vout->p_sys->p_cv );
-            var_Set( p_vout, "mouse-y", val );