[MPlayer-dev-eng] [PATCH] remove useless extern declarations
Reimar Döffinger
Reimar.Doeffinger at stud.uni-karlsruhe.de
Fri Aug 19 14:58:21 CEST 2005
Hi,
in libvo there are a lot of extern declarations of things that are
already in headers, attached patch removes them.
Also WinID is defined in video_out.c, but exported in
x11_common.h, changed that as well.
If nobody objects I will apply tomorrow.
Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libvo/video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.60
diff -u -r1.60 video_out.h
--- libvo/video_out.h 5 Aug 2005 01:24:36 -0000 1.60
+++ libvo/video_out.h 19 Aug 2005 12:54:08 -0000
@@ -201,6 +201,7 @@
extern int vo_refresh_rate;
extern int vo_keepaspect;
extern int vo_rootwin;
+extern int vo_ontop;
extern int vo_gamma_brightness;
extern int vo_gamma_saturation;
@@ -220,6 +221,8 @@
extern int vo_colorkey;
+extern int WinID;
+
#if defined(HAVE_FBDEV)||defined(HAVE_VESA)
typedef struct {
Index: libvo/vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.54
diff -u -r1.54 vo_directx.c
--- libvo/vo_directx.c 5 Aug 2005 01:24:36 -0000 1.54
+++ libvo/vo_directx.c 19 Aug 2005 12:54:14 -0000
@@ -81,14 +81,7 @@
extern void mplayer_put_key(int code); //let mplayer handel the keyevents
extern void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride));
-extern int vo_doublebuffering; //tribblebuffering
-extern int vo_fs;
-extern int vo_directrendering;
-extern int vo_ontop;
-extern int vo_rootwin;
extern int vidmode;
-extern int vo_colorkey;
-extern int WinID;
/*****************************************************************************
* DirectDraw GUIDs.
Index: libvo/vo_ggi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v
retrieving revision 1.36
diff -u -r1.36 vo_ggi.c
--- libvo/vo_ggi.c 5 Aug 2005 01:24:36 -0000 1.36
+++ libvo/vo_ggi.c 19 Aug 2005 12:54:15 -0000
@@ -39,10 +39,6 @@
#include <ggi/wmh.h>
#endif
-#ifdef HAVE_GGIWMH
-extern int vo_ontop; /* Window on top */
-#endif
-
/* maximum buffers */
#undef GGI_FLIP
Index: libvo/vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.14
diff -u -r1.14 vo_gif89a.c
--- libvo/vo_gif89a.c 5 Aug 2005 01:24:36 -0000 1.14
+++ libvo/vo_gif89a.c 19 Aug 2005 12:54:17 -0000
@@ -69,7 +69,6 @@
LIBVO_EXTERN(gif89a)
extern int verbose;
-extern int vo_config_count;
// how many frames per second we are aiming for during output.
Index: libvo/vo_quartz.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v
retrieving revision 1.55
diff -u -r1.55 vo_quartz.c
--- libvo/vo_quartz.c 5 Aug 2005 01:24:36 -0000 1.55
+++ libvo/vo_quartz.c 19 Aug 2005 12:54:25 -0000
@@ -67,15 +67,10 @@
static int EnterMoviesDone = 0;
static int get_image_done = 0;
-extern int vo_rootwin;
-extern int vo_ontop;
-extern int vo_fs; // user want fullscreen
static int vo_quartz_fs; // we are in fullscreen
extern float monitor_aspect;
-extern int vo_keepaspect; //keep aspect ratio when resizing
extern float movie_aspect;
static float old_movie_aspect;
-extern float vo_panscan;
static int winLevel = 1;
int levelList[] =
Index: libvo/vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.80
diff -u -r1.80 vo_svga.c
--- libvo/vo_svga.c 5 Aug 2005 12:46:42 -0000 1.80
+++ libvo/vo_svga.c 19 Aug 2005 12:54:28 -0000
@@ -52,9 +52,6 @@
//silence warnings, probably it have to go in some global header
#define UNUSED(x) ((void)(x))
-extern int vo_doublebuffering;
-extern int vo_directrendering;
-extern int vo_dbpp;
extern int verbose;
static int query_format(uint32_t format);
Index: libvo/vo_winvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_winvidix.c,v
retrieving revision 1.9
diff -u -r1.9 vo_winvidix.c
--- libvo/vo_winvidix.c 5 Aug 2005 01:24:36 -0000 1.9
+++ libvo/vo_winvidix.c 19 Aug 2005 12:54:29 -0000
@@ -56,7 +56,6 @@
extern void set_video_eq( int cap );
-extern int vo_config_count;
static LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
Index: libvo/vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.23
diff -u -r1.23 vo_xvmc.c
--- libvo/vo_xvmc.c 5 Aug 2005 01:24:37 -0000 1.23
+++ libvo/vo_xvmc.c 19 Aug 2005 12:54:37 -0000
@@ -46,7 +46,6 @@
#define UNUSED(x) ((void)(x))
-extern int vo_directrendering;
extern int vo_verbose;
static int benchmark;
Index: libvo/x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.194
diff -u -r1.194 x11_common.c
--- libvo/x11_common.c 27 Jun 2005 10:05:39 -0000 1.194
+++ libvo/x11_common.c 19 Aug 2005 12:54:45 -0000
@@ -80,7 +80,6 @@
int mLocalDisplay;
/* output window id */
-extern int WinID;
int vo_mouse_autohide = 0;
int vo_wm_type = 0;
int vo_fs_type = 0; // needs to be accessible for GUI X11 code
@@ -866,10 +865,6 @@
long state;
} MotifWmHints;
-extern int vo_depthonscreen;
-extern int vo_screenwidth;
-extern int vo_screenheight;
-
static MotifWmHints vo_MotifWmHints;
static Atom vo_MotifHints = None;
Index: libvo/x11_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v
retrieving revision 1.42
diff -u -r1.42 x11_common.h
--- libvo/x11_common.h 30 Jun 2005 10:16:35 -0000 1.42
+++ libvo/x11_common.h 19 Aug 2005 12:54:45 -0000
@@ -21,27 +21,17 @@
#define _NET_WM_STATE_TOGGLE 2 /* toggle property */
extern int metacity_hack;
-extern int vo_fsmode;
-extern int vo_depthonscreen;
-extern int vo_screenwidth;
-extern int vo_screenheight;
-extern int vo_dwidth;
-extern int vo_dheight;
-extern int vo_fs;
extern int vo_fs_layer;
extern int vo_wm_type;
extern int vo_fs_type;
extern char** vo_fstype_list;
-extern int vo_ontop;
-extern int vo_rootwin;
extern char *mDisplayName;
extern Display *mDisplay;
extern Window mRootWin;
extern int mScreen;
extern int mLocalDisplay;
-extern int WinID;
extern int vo_mouse_timer_const;
extern int vo_mouse_autohide;
More information about the MPlayer-dev-eng
mailing list