From 77eb726c3d388163a7be7a63f023c322700a1068 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 20 Feb 2008 08:51:53 +0000 Subject: Remove pointless #ifdefs around extern declarations. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26039 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/cfg.h | 10 ---------- libao2/audio_out.c | 38 -------------------------------------- libmenu/menu.c | 2 -- libvo/sub.h | 4 ---- libvo/video_out.c | 34 ---------------------------------- libvo/x11_common.h | 2 -- mencoder.c | 2 -- mpcommon.h | 2 -- mplayer.c | 2 -- osdep/getch2.h | 2 -- stream/stream.c | 26 -------------------------- subreader.h | 2 -- 12 files changed, 126 deletions(-) diff --git a/gui/cfg.h b/gui/cfg.h index b56b3a80ac..aba1b9f298 100644 --- a/gui/cfg.h +++ b/gui/cfg.h @@ -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; diff --git a/libao2/audio_out.c b/libao2/audio_out.c index 76d62c4365..c7999415e4 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -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; diff --git a/libmenu/menu.c b/libmenu/menu.c index dd9d6d8ec9..3c47623ed6 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -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[] = { diff --git a/libvo/sub.h b/libvo/sub.h index ef66bb1944..f15b4e6c8d 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -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; diff --git a/libvo/video_out.c b/libvo/video_out.c index 98feb468d7..286a173cb5 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -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[] = { diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 73fed1f3a6..dc3a9fbd3d 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -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 * ); diff --git a/mencoder.c b/mencoder.c index 7b1f754e8d..dc0efa974d 100644 --- a/mencoder.c +++ b/mencoder.c @@ -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; diff --git a/mpcommon.h b/mpcommon.h index 853149e626..742332c43c 100644 --- a/mpcommon.h +++ b/mpcommon.h @@ -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); diff --git a/mplayer.c b/mplayer.c index 8d78badef3..09083ed2a6 100644 --- a/mplayer.c +++ b/mplayer.c @@ -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; diff --git a/osdep/getch2.h b/osdep/getch2.h index bc3402a498..267e39e914 100644 --- a/osdep/getch2.h +++ b/osdep/getch2.h @@ -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 */ diff --git a/stream/stream.c b/stream/stream.c index 1dd1549890..9c1fb8b0b4 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -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_rtp; 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 diff --git a/subreader.h b/subreader.h index 789f66bbec..30b73c1614 100644 --- a/subreader.h +++ b/subreader.h @@ -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); -- cgit v1.2.3