Mercurial > mplayer.hg

comparison libvo/x11_common.h @ 34024:b48986b92913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary #ifdefs from header file.
author reimar
date Mon, 19 Sep 2011 22:03:36 +0000
parents 5c6f715d8042
children e7f393cb9d0f
comparison
equal deleted inserted replaced
34023:d0ecb5d14258 34024:b48986b92913
94 94
95 extern Window vo_window; 95 extern Window vo_window;
96 extern GC vo_gc; 96 extern GC vo_gc;
97 extern XSizeHints vo_hint; 97 extern XSizeHints vo_hint;
98 98
99 #ifdef CONFIG_XV 99
100 //XvPortID xv_port; 100
101 // XVideo related declarations
101 extern unsigned int xv_port; 102 extern unsigned int xv_port;
102 103
103 int vo_xv_set_eq(uint32_t xv_port, const char * name, int value); 104 int vo_xv_set_eq(uint32_t xv_port, const char * name, int value);
104 int vo_xv_get_eq(uint32_t xv_port, const char * name, int *value); 105 int vo_xv_get_eq(uint32_t xv_port, const char * name, int *value);
105 106
130 void xv_setup_colorkeyhandling(char const * ck_method_str, char const * ck_str); 131 void xv_setup_colorkeyhandling(char const * ck_method_str, char const * ck_str);
131 132
132 /*** test functions for common suboptions ***/ 133 /*** test functions for common suboptions ***/
133 int xv_test_ck( void * arg ); 134 int xv_test_ck( void * arg );
134 int xv_test_ckm( void * arg ); 135 int xv_test_ckm( void * arg );
135 #endif 136
137
136 138
137 void vo_setwindow( Window w,GC g ); 139 void vo_setwindow( Window w,GC g );
138 void vo_x11_putkey(int key); 140 void vo_x11_putkey(int key);
139 141
140 void xscreensaver_heartbeat(void); 142 void xscreensaver_heartbeat(void);
141 void saver_off( Display * ); 143 void saver_off( Display * );
142 void saver_on( Display * ); 144 void saver_on( Display * );
143 145
144 #ifdef CONFIG_XF86VM 146
147
148 // XF86VM-related functions
145 void vo_vm_switch(void); 149 void vo_vm_switch(void);
146 void vo_vm_close(void); 150 void vo_vm_close(void);
147 #endif 151
152
148 153
149 void update_xinerama_info(void); 154 void update_xinerama_info(void);
150 155
151 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); 156 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return);
152 157