This fixes namespace pollution of picture_sys_t.
### XCB ###
libxcb_x11_plugin_la_SOURCES = \
- xcb/xcb_vlc.h \
- xcb/x11.c \
- xcb/pictures.c \
- xcb/events.c
+ xcb/pictures.c xcb/pictures.h \
+ xcb/events.c xcb/events.h \
+ xcb/x11.c
libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS)
libxcb_xv_plugin_la_SOURCES = \
- xcb/xcb_vlc.h \
- xcb/xvideo.c \
- xcb/pictures.c \
- xcb/events.c
+ xcb/pictures.c xcb/pictures.h \
+ xcb/events.c xcb/events.h \
+ xcb/xvideo.c
libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
libxcb_glx_plugin_la_SOURCES = \
- xcb/xcb_vlc.h \
- xcb/glx.c \
- opengl.h \
- opengl.c \
- xcb/events.c
+ opengl.c opengl.h \
+ xcb/events.c xcb/events.h \
+ xcb/glx.c
libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(GL_CFLAGS)
libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \
#include <vlc_common.h>
#include <vlc_vout_display.h>
-#include "xcb_vlc.h"
+#include "events.h"
/**
* Check for an error
/**
- * @file xcb_vlc.h
+ * @file events.h
* @brief X C Bindings VLC module common header
*/
/*****************************************************************************
* Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#ifdef WORDS_BIGENDIAN
-# define ORDER XCB_IMAGE_ORDER_MSB_FIRST
-#else
-# define ORDER XCB_IMAGE_ORDER_LSB_FIRST
-#endif
-
#ifndef XCB_CURSOR_NONE
# define XCB_CURSOR_NONE ((xcb_cursor_t) 0U)
#endif
-#include <vlc_picture.h>
#include <vlc_vout_display.h>
/* keys.c */
xcb_cursor_t XCB_cursor_Create (xcb_connection_t *, const xcb_screen_t *);
int XCB_Manage (vout_display_t *vd, xcb_connection_t *conn, bool *);
-
-/* common.c */
-bool XCB_shm_Check (vlc_object_t *obj, xcb_connection_t *conn);
-
-/* FIXME
- * maybe it would be better to split this header in 2 */
-#include <xcb/shm.h>
-struct picture_sys_t
-{
- xcb_shm_seg_t segment;
-};
-int XCB_pictures_Alloc (vout_display_t *, picture_resource_t *, size_t size,
- xcb_connection_t *, bool attach);
-void XCB_pictures_Free (picture_resource_t *, xcb_connection_t *);
#include <vlc_opengl.h>
#include "../opengl.h"
-#include "xcb_vlc.h"
+#include "events.h"
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
#include <xcb/xcb.h>
#include <vlc_common.h>
-#include "xcb_vlc.h"
+#include "events.h"
#ifdef HAVE_XCB_KEYSYMS
#include <xcb/xcb_keysyms.h>
#include <vlc_common.h>
#include <vlc_vout_display.h>
-#include "xcb_vlc.h"
+#include "pictures.h"
+#include "events.h"
/** Check MIT-SHM shared memory support */
bool XCB_shm_Check (vlc_object_t *obj, xcb_connection_t *conn)
--- /dev/null
+/**
+ * @file pictures.h
+ * @brief XCB pictures allocation header
+ */
+/*****************************************************************************
+ * Copyright © 2009 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef WORDS_BIGENDIAN
+# define ORDER XCB_IMAGE_ORDER_MSB_FIRST
+#else
+# define ORDER XCB_IMAGE_ORDER_LSB_FIRST
+#endif
+
+#include <vlc_picture.h>
+#include <vlc_vout_display.h>
+#include <xcb/shm.h>
+
+bool XCB_shm_Check (vlc_object_t *obj, xcb_connection_t *conn);
+
+struct picture_sys_t
+{
+ xcb_shm_seg_t segment;
+};
+int XCB_pictures_Alloc (vout_display_t *, picture_resource_t *, size_t size,
+ xcb_connection_t *, bool attach);
+void XCB_pictures_Free (picture_resource_t *, xcb_connection_t *);
#include <vlc_plugin.h>
#include <vlc_vout_window.h>
-#include "xcb_vlc.h"
+#include "events.h"
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
#include <vlc_vout_display.h>
#include <vlc_picture_pool.h>
-#include "xcb_vlc.h"
+#include "pictures.h"
+#include "events.h"
static int Open (vlc_object_t *);
static void Close (vlc_object_t *);
#include <vlc_picture_pool.h>
#include <vlc_dialog.h>
-#include "xcb_vlc.h"
+#include "pictures.h"
+#include "events.h"
#define ADAPTOR_TEXT N_("XVideo adaptor number")
#define ADAPTOR_LONGTEXT N_( \