[MPlayer-dev-eng] [PATCH] fix missing extern for mplayer_put_key in vo_caca
Dominik 'Rathann' Mierzejewski
dominik at rangers.eu.org
Sun Oct 8 20:30:19 CEST 2006
On Sunday, 08 October 2006 at 19:57, Dominik 'Rathann' Mierzejewski wrote:
> On Sunday, 08 October 2006 at 19:37, Dominik 'Rathann' Mierzejewski wrote:
> > On Sunday, 08 October 2006 at 18:38, Dominik 'Rathann' Mierzejewski wrote:
> > > On Sunday, 08 October 2006 at 18:27, Attila Kinali wrote:
> > > > On Sun, 8 Oct 2006 17:19:03 +0200
> > > > Dominik 'Rathann' Mierzejewski <dominik at rangers.eu.org> wrote:
> > > >
> > > > > Fixes:
> > > > > vo_caca.c: In function ‘check_events’:
> > > > > vo_caca.c:239: warning: implicit declaration of function ‘mplayer_put_key’
> > > >
> > > > IMHO this function should go into a .h file and this .h file
> > > > should be included.
> > > >
> > > > We already have way too many extern blah() declarations.
> > >
> > > OK, I'll introduce fifo.h, remove relevant externs and add #include fifo.h
> > > instead.
> >
> > fifo.h is already in libavutil, hence m_fifo.h.
>
> Or even mp_fifo.h, as suggested by KotH. How about
> svn rename fifo.c mp_fifo.c
> as well?
Previous patch broke compilation of mplayer.c. This one is fixed.
--
MPlayer developer and RPMs maintainer: http://rpm.greysector.net/mplayer/
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
-- from "Collected Sayings of Muad'Dib" by the Princess Irulan
-------------- next part --------------
--- MPlayer-20114/mplayer.c.putkey 2006-10-02 01:21:11.000000000 +0200
+++ MPlayer-20114/mplayer.c 2006-10-08 20:26:56.000000000 +0200
@@ -196,7 +196,7 @@
//**************************************************************************//
// Common FIFO functions, and keyboard/event FIFO code
-#include "fifo.c"
+#include "mp_fifo.c"
int noconsolecontrols=0;
//**************************************************************************//
--- MPlayer-20114/libvo/vo_quartz.c.putkey 2006-06-05 19:39:23.000000000 +0200
+++ MPlayer-20114/libvo/vo_quartz.c 2006-10-08 20:15:26.000000000 +0200
@@ -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 @@
#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/////////////////////////////////////////////////////////////////
--- MPlayer-20114/libvo/w32_common.c.putkey 2006-07-17 18:02:26.000000000 +0200
+++ MPlayer-20114/libvo/w32_common.c 2006-10-08 20:15:26.000000000 +0200
@@ -8,8 +8,7 @@
#include "video_out.h"
#include "aspect.h"
#include "w32_common.h"
-
-extern void mplayer_put_key(int code);
+#include "mp_fifo.h"
#ifndef MONITOR_DEFAULTTOPRIMARY
#define MONITOR_DEFAULTTOPRIMARY 1
--- MPlayer-20114/libvo/vo_aa.c.putkey 2006-07-17 18:02:26.000000000 +0200
+++ MPlayer-20114/libvo/vo_aa.c 2006-10-08 20:15:26.000000000 +0200
@@ -37,6 +37,7 @@
#include "subopt-helper.h"
#include "help_mp.h"
#include "mp_msg.h"
+#include "mp_fifo.h"
#define MESSAGE_DURATION 3
@@ -85,8 +86,6 @@
/* our version of the playmodes :) */
-extern void mplayer_put_key(int code);
-
/* to disable stdout outputs when curses/linux mode */
extern int quiet;
--- MPlayer-20114/libvo/vo_caca.c.putkey 2006-10-02 01:21:07.000000000 +0200
+++ MPlayer-20114/libvo/vo_caca.c 2006-10-08 20:15:26.000000000 +0200
@@ -26,6 +26,7 @@
#include "osdep/keycodes.h"
#include "mp_msg.h"
+#include "mp_fifo.h"
#include <caca.h>
#ifdef CACA_API_VERSION_1
--- MPlayer-20114/libvo/vo_sdl.c.putkey 2006-08-29 23:19:56.000000000 +0200
+++ MPlayer-20114/libvo/vo_sdl.c 2006-10-08 20:15:26.000000000 +0200
@@ -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 =
{
@@ -1159,7 +1160,6 @@
**/
#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)
--- MPlayer-20114/libvo/vo_winvidix.c.putkey 2006-06-05 19:39:23.000000000 +0200
+++ MPlayer-20114/libvo/vo_winvidix.c 2006-10-08 20:15:26.000000000 +0200
@@ -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 =
{
--- MPlayer-20114/libvo/vo_directx.c.putkey 2006-09-01 23:57:51.000000000 +0200
+++ MPlayer-20114/libvo/vo_directx.c 2006-10-08 20:15:26.000000000 +0200
@@ -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 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;
--- MPlayer-20114/libvo/vo_directfb2.c.putkey 2006-09-01 23:57:51.000000000 +0200
+++ MPlayer-20114/libvo/vo_directfb2.c 2006-10-08 20:15:26.000000000 +0200
@@ -45,6 +45,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))
@@ -890,8 +891,6 @@
return 0;
}
-extern void mplayer_put_key(int code);
-
#include "osdep/keycodes.h"
static void check_events(void)
--- MPlayer-20114/libvo/vo_dfbmga.c.putkey 2006-09-01 23:57:51.000000000 +0200
+++ MPlayer-20114/libvo/vo_dfbmga.c 2006-10-08 20:15:26.000000000 +0200
@@ -37,6 +37,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",
@@ -1421,8 +1422,6 @@
return VO_NOTIMPL;
}
-extern void mplayer_put_key( int code );
-
#include "osdep/keycodes.h"
static void
--- MPlayer-20114/libvo/vo_ggi.c.putkey 2006-06-05 19:39:23.000000000 +0200
+++ MPlayer-20114/libvo/vo_ggi.c 2006-10-08 20:15:26.000000000 +0200
@@ -26,6 +26,7 @@
#include "video_out_internal.h"
#include "fastmemcpy.h"
+#include "mp_fifo.h"
#include <ggi/ggi.h>
@@ -471,7 +472,6 @@
/* EVENT handling */
#include "osdep/keycodes.h"
-extern void mplayer_put_key(int code);
static void check_events(void)
{
--- MPlayer-20114/libvo/x11_common.c.putkey 2006-09-19 00:59:38.000000000 +0200
+++ MPlayer-20114/libvo/x11_common.c 2006-10-08 20:15:26.000000000 +0200
@@ -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 @@
#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)
{
--- MPlayer-20114/Gui/win32/gui.c.putkey 2006-09-19 02:12:48.000000000 +0200
+++ MPlayer-20114/Gui/win32/gui.c 2006-10-08 20:15:26.000000000 +0200
@@ -28,6 +28,7 @@
#include <shlobj.h>
#include <version.h>
#include <mplayer.h>
+#include <mp_fifo.h>
#include <mp_msg.h>
#include <help_mp.h>
#include <cpudetect.h>
--- /dev/null 2006-10-06 19:56:12.485894500 +0200
+++ MPlayer-20114/mp_fifo.h 2006-10-08 20:15:26.000000000 +0200
@@ -0,0 +1,6 @@
+#ifndef MP_FIFO_H
+#define MP_FIFO_H
+
+void mplayer_put_key(int code);
+
+#endif
More information about the MPlayer-dev-eng
mailing list