From 02135001b44afc5446228228055c9ce7f29df5be Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 3 Aug 2008 15:21:40 +0000 Subject: Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27402 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 31fa4408a8..627d3940de 100644 --- a/mplayer.c +++ b/mplayer.c @@ -112,7 +112,7 @@ char *heartbeat_cmd; #include "stream/stream_radio.h" #endif -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN #include "stream/dvbin.h" #include "stream/cache2.h" #endif @@ -198,7 +198,7 @@ static MPContext mpctx_s = { .set_of_sub_pos = -1, .file_format = DEMUXER_TYPE_UNKNOWN, .loop_times = -1, -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN .last_dvb_step = 1, #endif }; @@ -1143,7 +1143,7 @@ void init_vo_spudec(void) { * make it all work is to use the builtin SDL-bootstrap code, which * will be done automatically by replacing our main() if we include SDL.h. */ -#if defined(__APPLE__) && defined(HAVE_SDL) +#if defined(__APPLE__) && defined(CONFIG_SDL) #include #endif @@ -3410,7 +3410,7 @@ if(mpctx->sh_video){ if(!mpctx->sh_video && !mpctx->sh_audio){ mp_msg(MSGT_CPLAYER,MSGL_FATAL, MSGTR_NoStreamFound); -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN if(mpctx->stream->type == STREAMTYPE_DVB) { int dir; @@ -3918,7 +3918,7 @@ if(rel_seek_secs || abs_seek_pos){ mp_msg(MSGT_GLOBAL,MSGL_V,"EOF code: %d \n",mpctx->eof); -#ifdef HAS_DVBIN_SUPPORT +#ifdef CONFIG_DVBIN if(mpctx->dvbin_reopen) { mpctx->eof = 0; -- cgit v1.2.3 From 82f319af620ae1e9c8b983d37b038b591575493c Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 4 Aug 2008 06:16:23 +0000 Subject: Change a bunch of X11-specific preprocessor directives. Switch from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27409 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 627d3940de..2abe64444b 100644 --- a/mplayer.c +++ b/mplayer.c @@ -58,7 +58,7 @@ #include "libvo/font_load.h" #include "libvo/sub.h" -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #include "libvo/x11_common.h" #endif @@ -691,7 +691,7 @@ void exit_player_with_rc(const char* how, int rc){ #ifdef WIN32 timeEndPeriod(1); #endif -#ifdef HAVE_X11 +#ifdef CONFIG_X11 #ifdef CONFIG_GUI if ( !use_gui ) #endif @@ -2734,7 +2734,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ printf("\n"); opt_exit = 1; } -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if(vo_fstype_list && strcmp(vo_fstype_list[0],"help")==0){ fstype_help(); mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); @@ -3745,7 +3745,7 @@ if(!mpctx->sh_video) { current_module="vo_check_events"; if (vo_config_count) mpctx->video_out->check_events(); -#ifdef HAVE_X11 +#ifdef CONFIG_X11 if (stop_xscreensaver) { current_module = "stop_xscreensaver"; xscreensaver_heartbeat(); -- cgit v1.2.3 From 141e81cce4fb780a1e2f791c79c1664956401af7 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 08:58:07 +0000 Subject: Rename a bunch of miscellaneous preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27423 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 2abe64444b..8fcd38ea2f 100644 --- a/mplayer.c +++ b/mplayer.c @@ -2789,7 +2789,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ if(font_fontconfig <= 0) { #endif -#ifdef HAVE_BITMAP_FONT +#ifdef CONFIG_BITMAP_FONT if(font_name){ vo_font=read_font_desc(font_name,font_factor,verbose>1); if(!vo_font) mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont, -- cgit v1.2.3 From 091d352d065442817aa05c2f61910366004405be Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 10:36:07 +0000 Subject: Rename font-related preprocessor directives. Switch them from a HAVE_ to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27425 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index 8fcd38ea2f..e2eb195664 100644 --- a/mplayer.c +++ b/mplayer.c @@ -698,7 +698,7 @@ void exit_player_with_rc(const char* how, int rc){ vo_uninit(); // Close the X11 connection (if any is open). #endif -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE current_module="uninit_font"; if (sub_font && sub_font != vo_font) free_font_desc(sub_font); sub_font = NULL; @@ -1027,7 +1027,7 @@ void add_subtitles(char *filename, float fps, int noerr) subd = sub_read_file(filename, fps); #ifdef CONFIG_ASS if (ass_enabled) -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV asst = ass_read_file(ass_library, filename, sub_cp); #else asst = ass_read_file(ass_library, filename, 0); @@ -2782,10 +2782,10 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ //------ load global data first ------ // check font -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE init_freetype(); #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if(font_fontconfig <= 0) { #endif @@ -2806,7 +2806,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ else sub_font = vo_font; #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG } #endif @@ -3543,7 +3543,7 @@ if(!reinit_video_chain()) { if(vo_flags & 0x08 && vo_spudec) spudec_set_hw_spu(vo_spudec,mpctx->video_out); -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE force_load_font = 1; #endif -- cgit v1.2.3 From e0b1c9a6b772683af9cb2a4f555cec1c5aa56afb Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 7 Aug 2008 12:20:50 +0000 Subject: Give a CONFIG_ prefix to preprocessor directives that lacked one and change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index e2eb195664..09bec5f97b 100644 --- a/mplayer.c +++ b/mplayer.c @@ -740,14 +740,14 @@ static void child_sighandler(int x){ } #endif -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG static char *prog_path; static int crash_debug = 0; #endif static void exit_sighandler(int x){ static int sig_count=0; -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG if (!crash_debug || x != SIGTRAP) #endif ++sig_count; @@ -791,7 +791,7 @@ static void exit_sighandler(int x){ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE); default: mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH); -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG if (crash_debug) { int gdb_pid; mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); @@ -2895,7 +2895,7 @@ current_module = NULL; signal(SIGCHLD,child_sighandler); #endif -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG prog_path = argv[0]; #endif //========= Catch terminate signals: ================ @@ -2907,14 +2907,14 @@ current_module = NULL; signal(SIGQUIT,exit_sighandler); // Quit from keyboard signal(SIGPIPE,exit_sighandler); // Some window managers cause this -#ifdef ENABLE_SIGHANDLER +#ifdef CONFIG_SIGHANDLER // fatal errors: signal(SIGBUS,exit_sighandler); // bus error signal(SIGSEGV,exit_sighandler); // segfault signal(SIGILL,exit_sighandler); // illegal instruction signal(SIGFPE,exit_sighandler); // floating point exc. signal(SIGABRT,exit_sighandler); // abort() -#ifdef CRASH_DEBUG +#ifdef CONFIG_CRASH_DEBUG if (crash_debug) signal(SIGTRAP,exit_sighandler); #endif -- cgit v1.2.3