X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=plugins%2Fmga%2Fvout_mga.h;h=fb94e04f059ddd992b5ebe049522f83e637acf7c;hb=583c6553f6761421260d86bbc21b5b3169c04319;hp=7d23e8d68fe05a88ebbff2d5edfcb8ff45db2b1b;hpb=3bb7a5371e29b608e29851b9f1366a12a3505afe;p=vlc diff --git a/plugins/mga/vout_mga.h b/plugins/mga/vout_mga.h index 7d23e8d68f..fb94e04f05 100644 --- a/plugins/mga/vout_mga.h +++ b/plugins/mga/vout_mga.h @@ -1,10 +1,9 @@ /***************************************************************************** * vout_mga.h: MGA video output display method headers ***************************************************************************** - * Copyright (C) 1999 Aaron Holtzman - * Copyright (C) 2000 VideoLAN + * Copyright (C) 1999 Aaron Holtzman + * Copyright (C) 2000, 2001 VideoLAN * - * Authors: * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,52 +48,3 @@ typedef struct mga_vid_config_s #endif -/***************************************************************************** - * vout_sys_t: video output X11 method descriptor - ***************************************************************************** - * This structure is part of the video output thread descriptor. - * It describes the X11 specific properties of an output thread. X11 video - * output is performed through regular resizable windows. Windows can be - * dynamically resized to adapt to the size of the streams. - *****************************************************************************/ -typedef struct vout_sys_s -{ - /* User settings */ - boolean_t b_shm; /* shared memory extension flag */ - - /* Internal settings and properties */ - Display * p_display; /* display pointer */ - Visual * p_visual; /* visual pointer */ - int i_screen; /* screen number */ - Window root_window; /* root window */ - Window window; /* window instance handler */ - GC gc; /* graphic context instance handler */ - Colormap colormap; /* colormap used (8bpp only) */ - - /* Display buffers and shared memory information */ - XImage * p_ximage[2]; /* XImage pointer */ - XShmSegmentInfo shm_info[2]; /* shared memory zone information */ - - /* MGA specific variables */ - int i_fd; - int i_size; - mga_vid_config_t * p_mga; - byte_t * p_mga_vid_base; - boolean_t b_g400; - -} vout_sys_t; - -/***************************************************************************** - * Local prototypes - *****************************************************************************/ -static int X11OpenDisplay ( vout_thread_t *p_vout, char *psz_display, Window root_window ); -static void X11CloseDisplay ( vout_thread_t *p_vout ); -static int X11CreateWindow ( vout_thread_t *p_vout ); -static void X11DestroyWindow ( vout_thread_t *p_vout ); -static int X11CreateImage ( vout_thread_t *p_vout, XImage **pp_ximage ); -static void X11DestroyImage ( XImage *p_ximage ); -static int X11CreateShmImage ( vout_thread_t *p_vout, XImage **pp_ximage, - XShmSegmentInfo *p_shm_info ); -static void X11DestroyShmImage ( vout_thread_t *p_vout, XImage *p_ximage, - XShmSegmentInfo *p_shm_info ); -