From 259cfbe7e23f353d15291875b70663517e973377 Mon Sep 17 00:00:00 2001 From: rathann Date: Thu, 29 Mar 2007 17:16:11 +0000 Subject: =?UTF-8?q?Code=20cleanup:=20don't=20include=20a=20.c=20file=20in?= =?UTF-8?q?=20mplayer.c=20and=20fix=20a=20few=20"implicit=20declaration=20?= =?UTF-8?q?of=20function=20=E2=80=98mplayer=5Fput=5Fkey=E2=80=99"=20warnin?= =?UTF-8?q?gs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Based on Attila's suggestions. Approved by Uoti and Ivan. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22841 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_aa.c | 3 +-- libvo/vo_caca.c | 1 + libvo/vo_dfbmga.c | 3 +-- libvo/vo_directfb2.c | 3 +-- libvo/vo_directx.c | 2 +- libvo/vo_ggi.c | 2 +- libvo/vo_quartz.c | 2 +- libvo/vo_sdl.c | 2 +- libvo/vo_winvidix.c | 2 +- libvo/w32_common.c | 2 +- libvo/x11_common.c | 3 +-- 11 files changed, 11 insertions(+), 14 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 3229d13cbb..6e9f9d5b4d 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -37,6 +37,7 @@ #include "subopt-helper.h" #include "help_mp.h" #include "mp_msg.h" +#include "mp_fifo.h" #define MESSAGE_DURATION 3 @@ -83,8 +84,6 @@ static struct SwsContext *sws=NULL; /* our version of the playmodes :) */ -extern void mplayer_put_key(int code); - /* to disable stdout outputs when curses/linux mode */ extern int quiet; diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c index 86c46fa7e7..31a260a7c9 100644 --- a/libvo/vo_caca.c +++ b/libvo/vo_caca.c @@ -26,6 +26,7 @@ #include "osdep/keycodes.h" #include "mp_msg.h" +#include "mp_fifo.h" #include #ifdef CACA_API_VERSION_1 diff --git a/libvo/vo_dfbmga.c b/libvo/vo_dfbmga.c index 8e4e861c92..17187b880e 100644 --- a/libvo/vo_dfbmga.c +++ b/libvo/vo_dfbmga.c @@ -39,6 +39,7 @@ #include "sub.h" #include "mp_msg.h" #include "aspect.h" +#include "mp_fifo.h" static vo_info_t info = { "DirectFB / Matrox G200/G400/G450/G550", @@ -1425,8 +1426,6 @@ control( uint32_t request, void *data, ... ) return VO_NOTIMPL; } -extern void mplayer_put_key( int code ); - #include "osdep/keycodes.h" static void diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 7be855a58d..376a011d1e 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -47,6 +47,7 @@ #include "mp_msg.h" #include "aspect.h" #include "subopt-helper.h" +#include "mp_fifo.h" #ifndef min #define min(x,y) (((x)<(y))?(x):(y)) @@ -892,8 +893,6 @@ static int config(uint32_t s_width, uint32_t s_height, uint32_t d_width, return 0; } -extern void mplayer_put_key(int code); - #include "osdep/keycodes.h" static void check_events(void) diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 9794a4ccfc..c57b0efbe1 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -34,6 +34,7 @@ #include "mp_msg.h" #include "aspect.h" #include "geometry.h" +#include "mp_fifo.h" #ifdef HAVE_NEW_GUI #include "Gui/interface.h" @@ -85,7 +86,6 @@ static float window_aspect; static BOOL (WINAPI* myGetMonitorInfo)(HMONITOR, LPMONITORINFO) = NULL; static RECT last_rect = {0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE, 0xDEADC0DE}; -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 vidmode; diff --git a/libvo/vo_ggi.c b/libvo/vo_ggi.c index 8129ab51a5..6213ec6e69 100644 --- a/libvo/vo_ggi.c +++ b/libvo/vo_ggi.c @@ -26,6 +26,7 @@ #include "video_out_internal.h" #include "fastmemcpy.h" +#include "mp_fifo.h" #include @@ -471,7 +472,6 @@ static int control(uint32_t request, void *data, ...) /* EVENT handling */ #include "osdep/keycodes.h" -extern void mplayer_put_key(int code); static void check_events(void) { diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index 05dce549a9..b9546dc80d 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -30,6 +30,7 @@ #include "aspect.h" #include "mp_msg.h" #include "m_option.h" +#include "mp_fifo.h" #include "input/input.h" #include "input/mouse.h" @@ -128,7 +129,6 @@ enum #include "osdep/keycodes.h" -extern void mplayer_put_key(int code); 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)); //PROTOTYPE///////////////////////////////////////////////////////////////// diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 0f8f74046c..415c43de17 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -125,6 +125,7 @@ #include "input/input.h" #include "input/mouse.h" #include "subopt-helper.h" +#include "mp_fifo.h" static vo_info_t info = { @@ -1160,7 +1161,6 @@ static int draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y) **/ #include "osdep/keycodes.h" -extern void mplayer_put_key(int code); #define shift_key (event.key.keysym.mod==(KMOD_LSHIFT||KMOD_RSHIFT)) static void check_events (void) diff --git a/libvo/vo_winvidix.c b/libvo/vo_winvidix.c index 6cefdd5a3d..0cf9a95cb6 100644 --- a/libvo/vo_winvidix.c +++ b/libvo/vo_winvidix.c @@ -22,11 +22,11 @@ #include "aspect.h" #include "mp_msg.h" +#include "mp_fifo.h" #include "vosub_vidix.h" #include "vidix/vidixlib.h" -extern void mplayer_put_key(int code); static vo_info_t info = { diff --git a/libvo/w32_common.c b/libvo/w32_common.c index db7ff26eae..b0e62ec529 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -10,8 +10,8 @@ #include "video_out.h" #include "aspect.h" #include "w32_common.h" +#include "mp_fifo.h" -extern void mplayer_put_key(int code); extern int enable_mouse_movements; #ifndef MONITOR_DEFAULTTOPRIMARY diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 3b2b821c0d..42f1bfd143 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -6,6 +6,7 @@ #include "config.h" #include "mp_msg.h" +#include "mp_fifo.h" #include "x11_common.h" #ifdef X11_FULLSCREEN @@ -557,8 +558,6 @@ void vo_uninit(void) #include "osdep/keycodes.h" #include "wskeys.h" -extern void mplayer_put_key(int code); - #ifdef XF86XK_AudioPause static void vo_x11_putkey_ext(int keysym) { -- cgit v1.2.3