[MPlayer-cvslog] r26039 - in trunk: gui/cfg.h libao2/audio_out.c libmenu/menu.c libvo/sub.h libvo/video_out.c libvo/x11_common.h mencoder.c mpcommon.h mplayer.c osdep/getch2.h stream/stream.c subreader.h
diego
subversion at mplayerhq.hu
Wed Feb 20 09:51:53 CET 2008
Author: diego
Date: Wed Feb 20 09:51:53 2008
New Revision: 26039
Log:
Remove pointless #ifdefs around extern declarations.
Modified:
trunk/gui/cfg.h
trunk/libao2/audio_out.c
trunk/libmenu/menu.c
trunk/libvo/sub.h
trunk/libvo/video_out.c
trunk/libvo/x11_common.h
trunk/mencoder.c
trunk/mpcommon.h
trunk/mplayer.c
trunk/osdep/getch2.h
trunk/stream/stream.c
trunk/subreader.h
Modified: trunk/gui/cfg.h
==============================================================================
--- trunk/gui/cfg.h (original)
+++ trunk/gui/cfg.h Wed Feb 20 09:51:53 2008
@@ -11,25 +11,15 @@ extern int gtkAONorm;
extern int gtkAOFakeSurround;
extern int gtkAOExtraStereo;
extern float gtkAOExtraStereoMul;
-#ifdef USE_OSS_AUDIO
extern char * gtkAOOSSMixer;
extern char * gtkAOOSSMixerChannel;
extern char * gtkAOOSSDevice;
-#endif
-#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X)
extern char * gtkAOALSAMixer;
extern char * gtkAOALSAMixerChannel;
extern char * gtkAOALSADevice;
-#endif
-#ifdef HAVE_SDL
extern char * gtkAOSDLDriver;
-#endif
-#ifdef USE_ESD
extern char * gtkAOESDDevice;
-#endif
-#ifdef HAVE_DXR3
extern char * gtkDXR3Device;
-#endif
extern int gtkCacheOn;
extern int gtkCacheSize;
Modified: trunk/libao2/audio_out.c
==============================================================================
--- trunk/libao2/audio_out.c (original)
+++ trunk/libao2/audio_out.c Wed Feb 20 09:51:53 2008
@@ -13,64 +13,26 @@
ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};
char *ao_subdevice = NULL;
-#ifdef USE_OSS_AUDIO
extern ao_functions_t audio_out_oss;
-#endif
-#ifdef MACOSX
extern ao_functions_t audio_out_macosx;
-#endif
-#ifdef USE_ARTS
extern ao_functions_t audio_out_arts;
-#endif
-#ifdef USE_ESD
extern ao_functions_t audio_out_esd;
-#endif
-#ifdef USE_PULSE
extern ao_functions_t audio_out_pulse;
-#endif
-#ifdef USE_JACK
extern ao_functions_t audio_out_jack;
-#endif
-#ifdef USE_OPENAL
extern ao_functions_t audio_out_openal;
-#endif
extern ao_functions_t audio_out_null;
-#ifdef HAVE_ALSA5
extern ao_functions_t audio_out_alsa5;
-#endif
-#ifdef HAVE_ALSA9
extern ao_functions_t audio_out_alsa;
-#endif
-#ifdef HAVE_ALSA1X
extern ao_functions_t audio_out_alsa;
-#endif
-#ifdef HAVE_NAS
extern ao_functions_t audio_out_nas;
-#endif
-#ifdef HAVE_SDL
extern ao_functions_t audio_out_sdl;
-#endif
-#ifdef USE_SUN_AUDIO
extern ao_functions_t audio_out_sun;
-#endif
-#ifdef USE_SGI_AUDIO
extern ao_functions_t audio_out_sgi;
-#endif
-#ifdef HAVE_WIN32WAVEOUT
extern ao_functions_t audio_out_win32;
-#endif
-#ifdef HAVE_DIRECTX
extern ao_functions_t audio_out_dsound;
-#endif
-#ifdef HAVE_DXR2
extern ao_functions_t audio_out_dxr2;
-#endif
-#ifdef HAVE_IVTV
extern ao_functions_t audio_out_ivtv;
-#endif
-#ifdef HAVE_V4L2_DECODER
extern ao_functions_t audio_out_v4l2;
-#endif
extern ao_functions_t audio_out_mpegpes;
extern ao_functions_t audio_out_pcm;
extern ao_functions_t audio_out_pss;
Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c (original)
+++ trunk/libmenu/menu.c Wed Feb 20 09:51:53 2008
@@ -30,9 +30,7 @@ extern menu_info_t menu_info_filesel;
extern menu_info_t menu_info_txt;
extern menu_info_t menu_info_console;
extern menu_info_t menu_info_pref;
-#ifdef HAS_DVBIN_SUPPORT
extern menu_info_t menu_info_dvbsel;
-#endif
menu_info_t* menu_info_list[] = {
Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h (original)
+++ trunk/libvo/sub.h Wed Feb 20 09:51:53 2008
@@ -65,12 +65,10 @@ extern subtitle* vo_sub;
extern unsigned char* vo_osd_text;
-#ifdef HAVE_TV_TELETEXT
extern void* vo_osd_teletext_page;
extern int vo_osd_teletext_half;
extern int vo_osd_teletext_mode;
extern int vo_osd_teletext_format;
-#endif
extern int vo_osd_progbar_type;
extern int vo_osd_progbar_value; // 0..255
@@ -104,9 +102,7 @@ extern char * sub_osd_names_short[];
extern int sub_unicode;
extern int sub_utf8;
-#ifdef USE_ICONV
extern char *sub_cp;
-#endif
extern int sub_pos;
extern int sub_width_p;
extern int sub_alignment;
Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c (original)
+++ trunk/libvo/video_out.c Wed Feb 20 09:51:53 2008
@@ -92,60 +92,26 @@ extern vo_functions_t video_out_aa;
extern vo_functions_t video_out_caca;
extern vo_functions_t video_out_mpegpes;
extern vo_functions_t video_out_yuv4mpeg;
-#ifdef HAVE_DIRECTX
extern vo_functions_t video_out_directx;
-#endif
-#ifdef HAVE_DXR2
extern vo_functions_t video_out_dxr2;
-#endif
extern vo_functions_t video_out_dxr3;
-#ifdef HAVE_IVTV
extern vo_functions_t video_out_ivtv;
-#endif
-#ifdef HAVE_V4L2_DECODER
extern vo_functions_t video_out_v4l2;
-#endif
-#ifdef HAVE_JPEG
extern vo_functions_t video_out_jpeg;
-#endif
-#ifdef HAVE_GIF
extern vo_functions_t video_out_gif89a;
-#endif
-#ifdef HAVE_VESA
extern vo_functions_t video_out_vesa;
-#endif
-#ifdef HAVE_DIRECTFB
extern vo_functions_t video_out_directfb;
-#ifdef HAVE_DFBMGA
extern vo_functions_t video_out_dfbmga;
-#endif
-#endif
-#ifdef CONFIG_VIDIX
extern vo_functions_t video_out_xvidix;
extern vo_functions_t video_out_winvidix;
extern vo_functions_t video_out_cvidix;
-#endif
-#ifdef HAVE_TDFX_VID
extern vo_functions_t video_out_tdfx_vid;
-#endif
-#ifdef HAVE_XVR100
extern vo_functions_t video_out_xvr100;
-#endif
-#ifdef HAVE_TGA
extern vo_functions_t video_out_tga;
-#endif
-#ifdef MACOSX
-#ifdef MACOSX_COREVIDEO
extern vo_functions_t video_out_macosx;
-#endif
extern vo_functions_t video_out_quartz;
-#endif
-#ifdef HAVE_PNM
extern vo_functions_t video_out_pnm;
-#endif
-#ifdef HAVE_MD5SUM
extern vo_functions_t video_out_md5sum;
-#endif
const vo_functions_t* const video_out_drivers[] =
{
Modified: trunk/libvo/x11_common.h
==============================================================================
--- trunk/libvo/x11_common.h (original)
+++ trunk/libvo/x11_common.h Wed Feb 20 09:51:53 2008
@@ -108,10 +108,8 @@ int xv_test_ck( void * arg );
int xv_test_ckm( void * arg );
#endif
-#ifdef HAVE_NEW_GUI
extern void vo_setwindow( Window w,GC g );
extern void vo_x11_putkey(int key);
-#endif
void saver_off( Display * );
void saver_on( Display * );
Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c (original)
+++ trunk/mencoder.c Wed Feb 20 09:51:53 2008
@@ -191,9 +191,7 @@ static int play_n_frames_mf=-1;
// sub:
char *font_name=NULL;
char *sub_font_name=NULL;
-#ifdef HAVE_FONTCONFIG
extern int font_fontconfig;
-#endif
float font_factor=0.75;
char **sub_name=NULL;
float sub_delay=0;
Modified: trunk/mpcommon.h
==============================================================================
--- trunk/mpcommon.h (original)
+++ trunk/mpcommon.h Wed Feb 20 09:51:53 2008
@@ -2,9 +2,7 @@
#define MPCOMMON_H
extern double sub_last_pts;
-#ifdef USE_ASS
extern ass_track_t *ass_track;
-#endif
extern subtitle *vo_sub_last;
void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset);
void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c (original)
+++ trunk/mplayer.c Wed Feb 20 09:51:53 2008
@@ -316,9 +316,7 @@ char** audio_driver_list=NULL;
// sub:
char *font_name=NULL;
char *sub_font_name=NULL;
-#ifdef HAVE_FONTCONFIG
extern int font_fontconfig;
-#endif
float font_factor=0.75;
char **sub_name=NULL;
float sub_delay=0;
Modified: trunk/osdep/getch2.h
==============================================================================
--- trunk/osdep/getch2.h (original)
+++ trunk/osdep/getch2.h Wed Feb 20 09:51:53 2008
@@ -24,8 +24,6 @@ extern void getch2_disable(void);
/* Read a character or a special key code (see keycodes.h) */
extern void getch2(void);
-#ifdef __MINGW32__
extern int mp_input_win32_slave_cmd_func(int fd,char* dest,int size);
-#endif
#endif /* GETCH2_H */
Modified: trunk/stream/stream.c
==============================================================================
--- trunk/stream/stream.c (original)
+++ trunk/stream/stream.c Wed Feb 20 09:51:53 2008
@@ -34,13 +34,8 @@
//#include "vcd_read_bincue.h"
-#ifdef HAVE_VCD
extern const stream_info_t stream_info_vcd;
-#endif
-#ifdef HAVE_CDDA
extern const stream_info_t stream_info_cdda;
-#endif
-#ifdef MPLAYER_NETWORK
extern const stream_info_t stream_info_netstream;
extern const stream_info_t stream_info_pnm;
extern const stream_info_t stream_info_asf;
@@ -49,44 +44,23 @@ extern const stream_info_t stream_info_r
extern const stream_info_t stream_info_udp;
extern const stream_info_t stream_info_http1;
extern const stream_info_t stream_info_http2;
-#endif
-#ifdef HAS_DVBIN_SUPPORT
extern const stream_info_t stream_info_dvb;
-#endif
-#ifdef USE_TV
extern const stream_info_t stream_info_tv;
-#endif
-#ifdef USE_RADIO
extern const stream_info_t stream_info_radio;
-#endif
-#ifdef HAVE_PVR
extern const stream_info_t stream_info_pvr;
-#endif
-#ifdef HAVE_FTP
extern const stream_info_t stream_info_ftp;
-#endif
-#ifdef HAVE_VSTREAM
extern const stream_info_t stream_info_vstream;
-#endif
-#ifdef USE_DVDNAV
extern const stream_info_t stream_info_dvdnav;
-#endif
-#ifdef LIBSMBCLIENT
extern const stream_info_t stream_info_smb;
-#endif
-#ifdef STREAMING_LIVE555
extern const stream_info_t stream_info_sdp;
extern const stream_info_t stream_info_rtsp_sip;
-#endif
extern const stream_info_t stream_info_cue;
extern const stream_info_t stream_info_null;
extern const stream_info_t stream_info_mf;
extern const stream_info_t stream_info_file;
-#ifdef USE_DVDREAD
extern const stream_info_t stream_info_ifo;
extern const stream_info_t stream_info_dvd;
-#endif
static const stream_info_t* const auto_open_streams[] = {
#ifdef HAVE_VCD
Modified: trunk/subreader.h
==============================================================================
--- trunk/subreader.h (original)
+++ trunk/subreader.h Wed Feb 20 09:51:53 2008
@@ -60,11 +60,9 @@ typedef struct {
int sub_errs;
} sub_data;
-#ifdef USE_FRIBIDI
extern char *fribidi_charset;
extern int flip_hebrew;
extern int fribidi_flip_commas;
-#endif
sub_data* sub_read_file (char *filename, float pts);
subtitle* subcp_recode (subtitle *sub);
More information about the MPlayer-cvslog
mailing list