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

4 files changed, 14 insertions, 14 deletions

diff --git a/libvo/sub.c b/libvo/sub.c
index 8b4177f913..b87f15c9bc 100644
--- a/libvo/sub.c
+++ b/libvo/sub.c
@@ -14,7 +14,7 @@
 #define OSD_NAV_BOX_ALPHA 0x7f
 #endif
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 #include "stream/tv.h"
 #include "osdep/timer.h"
 #endif
@@ -73,7 +73,7 @@ font_desc_t* vo_font=NULL;
 font_desc_t* sub_font=NULL;
 
 unsigned char* vo_osd_text=NULL;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 void* vo_osd_teletext_page=NULL;
 int vo_osd_teletext_half = 0;
 int vo_osd_teletext_mode=0;
@@ -242,7 +242,7 @@ inline static void vo_update_nav (mp_osd_obj_t *obj, int dxs, int dys) {
 }
 #endif
 
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 // renders char to a big per-object buffer where alpha and bitmap are separated
 static void tt_draw_alpha_buf(mp_osd_obj_t* obj, int x0,int y0, int w,int h, unsigned char* src, int stride,int fg,int bg,int alpha)
 {
@@ -1123,7 +1123,7 @@ int vo_update_osd(int dxs,int dys){
 	case OSDTYPE_SUBTITLE:
 	    vo_update_text_sub(obj,dxs,dys);
 	    break;
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case OSDTYPE_TELETEXT:
 	    vo_update_text_teletext(obj,dxs,dys);
 	    break;
@@ -1195,7 +1195,7 @@ void vo_init_osd(void){
 #ifdef CONFIG_DVDNAV
     new_osd_obj(OSDTYPE_DVDNAV);
 #endif
-#if HAVE_TV_TELETEXT
+#if CONFIG_TV_TELETEXT
     new_osd_obj(OSDTYPE_TELETEXT);
 #endif
 #ifdef HAVE_FREETYPE
@@ -1236,7 +1236,7 @@ void vo_draw_text(int dxs,int dys,void (*draw_alpha)(int x0,int y0, int w,int h,
 #ifdef CONFIG_DVDNAV
         case OSDTYPE_DVDNAV:
 #endif
-#ifdef HAVE_TV_TELETEXT
+#ifdef CONFIG_TV_TELETEXT
 	case OSDTYPE_TELETEXT:
 #endif
 	case OSDTYPE_OSD:
diff --git a/libvo/video_out.c b/libvo/video_out.c
index fccc085c21..2d62fc7e87 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -178,19 +178,19 @@ const vo_functions_t* const video_out_drivers[] =
 #ifdef CONFIG_CACA
 	&video_out_caca,
 #endif
-#ifdef HAVE_DXR2
+#ifdef CONFIG_DXR2
 	&video_out_dxr2,
 #endif
-#ifdef HAVE_DXR3
+#ifdef CONFIG_DXR3
 	&video_out_dxr3,
 #endif
-#ifdef HAVE_IVTV
+#ifdef CONFIG_IVTV
         &video_out_ivtv,
 #endif
-#ifdef HAVE_V4L2_DECODER
+#ifdef CONFIG_V4L2_DECODER
         &video_out_v4l2,
 #endif
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
 	&video_out_zr,
 	&video_out_zr2,
 #endif
diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m
index 1a01cf735a..e980cfc456 100644
--- a/libvo/vo_macosx.m
+++ b/libvo/vo_macosx.m
@@ -326,7 +326,7 @@ static int preinit(const char *arg)
 	
 	if(!shared_buffer)
 	{
-		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+		#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
 		//this chunk of code is heavily based off SDL_macosx.m from SDL 
 		//it uses an Apple private function to request foreground operation
 		void CPSEnableForegroundOperation(ProcessSerialNumber* psn);
@@ -913,7 +913,7 @@ static int control(uint32_t request, void *data, ...)
 	// Without SDL's bootstrap code (include SDL.h in mplayer.c),
 	// on Leopard, we got trouble to get the play window auto focused
 	// when app is actived. Following code fix this problem.
-#ifndef HAVE_SDL
+#ifndef CONFIG_SDL
 	if (isLeopardOrLater && [event type] == NSAppKitDefined
 			&& [event subtype] == NSApplicationActivatedEventType) {
 		[window makeMainWindow];
diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c
index 5b550df418..2454600ddc 100644
--- a/libvo/vo_quartz.c
+++ b/libvo/vo_quartz.c
@@ -1141,7 +1141,7 @@ static int preinit(const char *arg)
         }
     }
 	
-#if !defined (MACOSX_FINDER_SUPPORT) || !defined (HAVE_SDL)
+#if !defined (MACOSX_FINDER_SUPPORT) || !defined (CONFIG_SDL)
 	//this chunk of code is heavily based off SDL_macosx.m from SDL 
 	//it uses an Apple private function to request foreground operation
 {