Changeset b687f9e9cff90c72eb4f51332a314d098da4ffe6

Timestamp:

01/28/08 18:14:18 (7 months ago)

Author:

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

git-committer:

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

git-parent:

[8728e7f2de59f4bd740ed0abe6e09a7c8fede9ec]

git-author:

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

Message:

xcommon.c: fix warnings

Files:

• modules/video_output/x11/xcommon.c (modified) (10 diffs)

modules/video_output/x11/xcommon.c

@@ -116 +116 @@
-static void FreePicture    ( vout_thread_t *, picture_t * );
-
+#ifndef MODULE_NAME_IS_glx
-static IMAGE_TYPE *CreateImage    ( vout_thread_t *,
-                                    Display *, EXTRA_ARGS, int, int );
+#endif
+
-#ifdef HAVE_SYS_SHM_H
+#ifndef MODULE_NAME_IS_glx
-static IMAGE_TYPE *CreateShmImage ( vout_thread_t *,
-                                    Display *, EXTRA_ARGS_SHM, int, int );
+#endif
-static int i_shm_major = 0;
-#endif
@@ -1614 +1619 @@
-    if( !p_vout->b_fullscreen )
-    {
-
-
+
-                                        &p_win->i_width, &p_win->i_height );
-
@@ -1683 +1687 @@
-                               p_win->base_window, &xsize_hints );
-            XSetCommand( p_vout->p_sys->p_display, p_win->base_window,
-
+
+
-
-            if( !var_GetBool( p_vout, "video-deco") )
@@ -1971 +1976 @@
-                 i_plane++ )
-            {
-
+(uint8_t*)
-                    + p_pic->p_sys->p_image->offsets[i_plane];
-                p_pic->p[i_plane].i_pitch =
@@ -1980 +1985 @@
-                /* U and V inverted compared to I420
-                 * Fixme: this should be handled by the vout core */
-
+(uint8_t*)
-                    + p_pic->p_sys->p_image->offsets[2];
-
+(uint8_t*)
-                    + p_pic->p_sys->p_image->offsets[1];
-            }
@@ -1996 +2001 @@
-            p_pic->p->i_lines = p_pic->p_sys->p_image->height;
-            p_pic->p->i_visible_lines = p_pic->p_sys->p_image->height;
-
+(uint8_t*)
-                                  + p_pic->p_sys->p_image->xoffset;
-            p_pic->p->i_pitch = p_pic->p_sys->p_image->bytes_per_line;
@@ -2016 +2021 @@
-            return -1;
-    }
+#else
+
+    VLC_UNUSED(p_vout); VLC_UNUSED(p_pic);
-
-#endif /* !MODULE_NAME_IS_glx */
@@ -2801 +2809 @@
-}
-
+#ifndef MODULE_NAME_IS_glx
+
-#ifdef HAVE_SYS_SHM_H
-/*****************************************************************************
@@ -2960 +2970 @@
-}
-
+#endif
-/*****************************************************************************
- * X11ErrorHandler: replace error handler so we can intercept some of them
@@ -2981 +2992 @@
-    }
-
+#ifdef HAVE_SYS_SHM_H
-    if( event->request_code == i_shm_major ) /* MIT-SHM */
-        return i_shm_major = 0;
+#endif
-
-    XSetErrorHandler(NULL);