diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:36:07 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-07 10:36:07 +0000 |
commit | 091d352d065442817aa05c2f61910366004405be (patch) | |
tree | 9f9101aac327a41f88a3828a19cf6f2e5f4d4fc9 | |
parent | dba246199c20857d29a08bf176003b58736da31c (diff) | |
download | mpv-091d352d065442817aa05c2f61910366004405be.tar.bz2 mpv-091d352d065442817aa05c2f61910366004405be.tar.xz |
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
-rw-r--r-- | cfg-common-opts.h | 14 | ||||
-rw-r--r-- | cfg-mplayer.h | 4 | ||||
-rw-r--r-- | command.c | 6 | ||||
-rwxr-xr-x | configure | 20 | ||||
-rw-r--r-- | gui/cfg.c | 4 | ||||
-rw-r--r-- | gui/interface.c | 8 | ||||
-rw-r--r-- | gui/mplayer/gtk/fs.c | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/opts.c | 36 | ||||
-rw-r--r-- | libass/ass.c | 12 | ||||
-rw-r--r-- | libass/ass_font.c | 2 | ||||
-rw-r--r-- | libass/ass_fontconfig.c | 8 | ||||
-rw-r--r-- | libass/ass_fontconfig.h | 2 | ||||
-rw-r--r-- | libass/ass_mp.c | 6 | ||||
-rw-r--r-- | libmenu/menu.c | 8 | ||||
-rw-r--r-- | libmenu/vf_menu.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 6 | ||||
-rw-r--r-- | libvo/font_load.h | 10 | ||||
-rw-r--r-- | libvo/font_load_ft.c | 12 | ||||
-rw-r--r-- | libvo/sub.c | 6 | ||||
-rw-r--r-- | libvo/vo_aa.c | 2 | ||||
-rw-r--r-- | libvo/vo_dxr3.c | 2 | ||||
-rw-r--r-- | libvo/vo_gl.c | 2 | ||||
-rw-r--r-- | mencoder.c | 6 | ||||
-rw-r--r-- | mp_msg.c | 10 | ||||
-rw-r--r-- | mplayer.c | 12 | ||||
-rw-r--r-- | osdep/getch2-os2.c | 4 | ||||
-rw-r--r-- | osdep/getch2-win.c | 2 | ||||
-rw-r--r-- | osdep/getch2.c | 4 | ||||
-rw-r--r-- | stream/asf_mmst_streaming.c | 14 | ||||
-rw-r--r-- | subreader.c | 32 | ||||
-rw-r--r-- | subreader.h | 2 |
31 files changed, 130 insertions, 130 deletions
diff --git a/cfg-common-opts.h b/cfg-common-opts.h index 5c33ac5e24..d1c731be1f 100644 --- a/cfg-common-opts.h +++ b/cfg-common-opts.h @@ -11,7 +11,7 @@ {"msglevel", msgl_config, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, {"msgcolor", &mp_msg_color, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"msgmodule", &mp_msg_module, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV {"msgcharset", &mp_msg_charset, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, @@ -264,7 +264,7 @@ // ------------------------- subtitles options -------------------- {"sub", &sub_name, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI {"fribidi-charset", &fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"flip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noflip-hebrew", &flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, @@ -276,8 +276,8 @@ {"noflip-hebrew", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"flip-hebrew-commas", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"noflip-hebrew-commas", "MPlayer was compiled without FriBiDi support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* HAVE_FRIBIDI */ -#ifdef HAVE_ICONV +#endif /* CONFIG_FRIBIDI */ +#ifdef CONFIG_ICONV {"subcp", &sub_cp, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0, NULL}, @@ -309,7 +309,7 @@ {"spualign", &spu_alignment, CONF_TYPE_INT, CONF_RANGE, -1, 2, NULL}, {"spuaa", &spu_aamode, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, {"spugauss", &spu_gaussvar, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 3.0, NULL}, -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE {"subfont-encoding", &subtitle_font_encoding, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"subfont-text-scale", &text_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL}, {"subfont-osd-scale", &osd_font_scale_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0, 100, NULL}, @@ -334,12 +334,12 @@ {"ass-styles", &ass_styles_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"ass-hinting", &ass_hinting, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL}, #endif -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG {"fontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, -1, 1, NULL}, {"nofontconfig", &font_fontconfig, CONF_TYPE_FLAG, 0, 1, -1, NULL}, #else {"fontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"nofontconfig", "MPlayer was compiled without fontconfig support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* HAVE_FONTCONFIG */ +#endif /* CONFIG_FONTCONFIG */ #endif /* MPLAYER_CFG_COMMON_OPTS_H */ diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 509ccd3aba..bcc8d00e45 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -259,13 +259,13 @@ const m_option_t mplayer_opts[]={ {"menu-startup", &menu_startup, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"menu-keepdir", &menu_keepdir, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, {"menu-chroot", &menu_chroot, CONF_TYPE_STRING, 0, 0, 0, NULL}, -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI {"menu-fribidi-charset", &menu_fribidi_charset, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"menu-flip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"menu-noflip-hebrew", &menu_flip_hebrew, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"menu-flip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"menu-noflip-hebrew-commas", &menu_fribidi_flip_commas, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#endif /* HAVE_FRIBIDI */ +#endif /* CONFIG_FRIBIDI */ #else {"menu", "OSD menu support was not compiled in.\n", CONF_TYPE_PRINT,0, 0, 0, NULL}, #endif /* CONFIG_MENU */ @@ -1776,7 +1776,7 @@ static int mp_property_sub_forced_only(m_option_t * prop, int action, } -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE /// Subtitle scale (RW) static int mp_property_sub_scale(m_option_t * prop, int action, void *arg, MPContext * mpctx) @@ -2076,7 +2076,7 @@ static const m_option_t mp_properties[] = { M_OPT_RANGE, 0, 1, NULL }, { "sub_forced_only", mp_property_sub_forced_only, CONF_TYPE_FLAG, M_OPT_RANGE, 0, 1, NULL }, -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE { "sub_scale", mp_property_sub_scale, CONF_TYPE_FLOAT, M_OPT_RANGE, 0, 100, NULL }, #endif @@ -2209,7 +2209,7 @@ static struct { { "sub_delay", MP_CMD_SUB_DELAY, 0, 0, OSD_MSG_SUB_DELAY, MSGTR_SubDelayStatus }, { "sub_visibility", MP_CMD_SUB_VISIBILITY, 1, 0, -1, MSGTR_SubVisibleStatus }, { "sub_forced_only", MP_CMD_SUB_FORCED_ONLY, 1, 0, -1, MSGTR_SubForcedOnlyStatus }, -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE { "sub_scale", MP_CMD_SUB_SCALE, 0, 0, -1, MSGTR_SubScale}, #endif #ifdef CONFIG_ASS @@ -3173,9 +3173,9 @@ EOF done fi if test "$_iconv" = yes ; then - _def_iconv='#define HAVE_ICONV 1' + _def_iconv='#define CONFIG_ICONV 1' else - _def_iconv='#undef HAVE_ICONV' + _def_iconv='#undef CONFIG_ICONV' fi echores "$_iconv" @@ -5647,11 +5647,11 @@ EOF fi fi if test "$_freetype" = yes ; then - _def_freetype='#define HAVE_FREETYPE' + _def_freetype='#define CONFIG_FREETYPE' _inc_extra="$_inc_extra `$_freetypeconfig --cflags`" _ld_extra="$_ld_extra `$_freetypeconfig --libs`" else - _def_freetype='#undef HAVE_FREETYPE' + _def_freetype='#undef CONFIG_FREETYPE' fi echores "$_freetype" @@ -5687,9 +5687,9 @@ EOF fi fi if test "$_fontconfig" = yes ; then - _def_fontconfig='#define HAVE_FONTCONFIG' + _def_fontconfig='#define CONFIG_FONTCONFIG' else - _def_fontconfig='#undef HAVE_FONTCONFIG' + _def_fontconfig='#undef CONFIG_FONTCONFIG' fi echores "$_fontconfig" @@ -5747,11 +5747,11 @@ EOF fi fi if test "$_fribidi" = yes ; then - _def_fribidi='#define HAVE_FRIBIDI' + _def_fribidi='#define CONFIG_FRIBIDI' _inc_extra="$_inc_extra `$_fribidiconfig --cflags`" _ld_extra="$_ld_extra `$_fribidiconfig --libs`" else - _def_fribidi='#undef HAVE_FRIBIDI' + _def_fribidi='#undef CONFIG_FRIBIDI' fi echores "$_fribidi" @@ -5772,10 +5772,10 @@ EOF cc_check -lenca $_ld_lm && _enca=yes fi if test "$_enca" = yes ; then - _def_enca='#define HAVE_ENCA 1' + _def_enca='#define CONFIG_ENCA 1' _ld_extra="$_ld_extra -lenca" else - _def_enca='#undef HAVE_ENCA' + _def_enca='#undef CONFIG_ENCA' fi echores "$_enca" @@ -165,12 +165,12 @@ static const m_option_t gui_opts[] = #endif { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL }, { "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL }, -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV { "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL }, #endif { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL }, { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL }, -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE { "font_encoding",&subtitle_font_encoding,CONF_TYPE_STRING,0,0,0,NULL }, { "font_text_scale",&text_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL }, { "font_osd_scale",&osd_font_scale_factor,CONF_TYPE_FLOAT,CONF_RANGE,0,100,NULL }, diff --git a/gui/interface.c b/gui/interface.c index d33810a53d..f41c5332bf 100644 --- a/gui/interface.c +++ b/gui/interface.c @@ -51,7 +51,7 @@ extern af_cfg_t af_cfg; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> #endif @@ -400,7 +400,7 @@ extern m_obj_settings_t * vf_settings; void guiLoadFont( void ) { -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE load_font_ft(vo_image_width, vo_image_height, &vo_font, font_name, osd_font_scale_factor); #else if ( vo_font ) @@ -1075,7 +1075,7 @@ void * gtkSet( int cmd,float fparam, void * vparam ) } else { url_item->next=NULL; URLList=url_item; } return NULL; // --- subtitle -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE case gtkSetFontFactor: font_factor=fparam; guiLoadFont(); @@ -1107,7 +1107,7 @@ void * gtkSet( int cmd,float fparam, void * vparam ) guiLoadFont(); return NULL; #endif -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV case gtkSetSubEncoding: gfree( (void **)&sub_cp ); sub_cp=gstrdup( (char *)vparam ); diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c index 043f999ebb..fb774dead8 100644 --- a/gui/mplayer/gtk/fs.c +++ b/gui/mplayer/gtk/fs.c @@ -116,7 +116,7 @@ int fsLastAudioFilterSelected = -1; char * fsFontFileNames[][2] = { -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE { "True Type fonts (*.ttf)", "*.ttf" }, { "Type1 fonts (*.pfb)", "*.pfb" }, { "All fonts", "*.ttf,*.pfb" }, diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c index a5b4f762c2..2a638b3f55 100644 --- a/gui/mplayer/gtk/opts.c +++ b/gui/mplayer/gtk/opts.c @@ -122,7 +122,7 @@ static GtkWidget * HSFPS; static GtkAdjustment * HSExtraStereoMuladj, * HSAudioDelayadj, * HSPanscanadj, * HSSubDelayadj; static GtkAdjustment * HSSubPositionadj, * HSSubFPSadj, * HSPPQualityadj, * HSFPSadj; -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE static GtkWidget * HSFontFactor; static GtkAdjustment * HSFontFactoradj; #else @@ -133,11 +133,11 @@ static GtkWidget * RBFontNoAutoScale, * RBFontAutoScaleWidth, * RBFontAutoSc //static GtkWidget * AutoScale; #endif -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV static GtkWidget * CBSubEncoding, * ESubEncoding; #endif -#if defined(HAVE_FREETYPE) || defined(HAVE_ICONV) +#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) static struct { char * name; @@ -188,7 +188,7 @@ static int old_video_driver = 0; static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer user_data ); static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ); static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ); -#if defined(HAVE_FREETYPE) || defined(HAVE_ICONV) +#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) static void prEntry( GtkContainer * container,gpointer user_data ); #endif @@ -312,7 +312,7 @@ void ShowPreferences( void ) if ( guiIntfStruct.Subtitlename ) gtk_entry_set_text( GTK_ENTRY( ESubtitleName ),guiIntfStruct.Subtitlename ); #endif -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if ( sub_cp ) { int i; @@ -326,7 +326,7 @@ void ShowPreferences( void ) // --- 4. page // font ... if ( font_name ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name ); -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE gtk_adjustment_set_value( HSFontFactoradj,font_factor ); #else gtk_adjustment_set_value( HSFontBluradj,( subtitle_font_radius / 8.0f ) * 100.0f ); @@ -434,7 +434,7 @@ void ShowPreferences( void ) gtk_signal_connect( GTK_OBJECT( CBSoftwareMixer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 ); gtk_signal_connect( GTK_OBJECT( CBAudioEqualizer ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)2 ); gtk_signal_connect( GTK_OBJECT( CBShowVideoWindow ),"toggled",GTK_SIGNAL_FUNC( prToggled ), (void*)3 ); -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE gtk_signal_connect( GTK_OBJECT( RBFontNoAutoScale ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)4 ); gtk_signal_connect( GTK_OBJECT( RBFontAutoScaleHeight ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)5 ); gtk_signal_connect( GTK_OBJECT( RBFontAutoScaleWidth ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)6 ); @@ -451,7 +451,7 @@ void ShowPreferences( void ) gtk_signal_connect( GTK_OBJECT( HSPanscan ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)2 ); gtk_signal_connect( GTK_OBJECT( HSSubDelay ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)3 ); gtk_signal_connect( GTK_OBJECT( HSSubPosition ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)4 ); -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE gtk_signal_connect( GTK_OBJECT( HSFontFactor ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)5 ); #else gtk_signal_connect( GTK_OBJECT( HSFontBlur ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)6 ); @@ -460,7 +460,7 @@ void ShowPreferences( void ) gtk_signal_connect( GTK_OBJECT( HSFontOSDScale ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)9 ); gtk_signal_connect( GTK_OBJECT( EFontEncoding ),"changed",GTK_SIGNAL_FUNC( prEntry ),(void *)0 ); #endif -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV gtk_signal_connect( GTK_OBJECT( ESubEncoding ),"changed",GTK_SIGNAL_FUNC( prEntry ),(void *)1 ); #endif gtk_signal_connect( GTK_OBJECT( HSPPQuality ),"motion_notify_event",GTK_SIGNAL_FUNC( prHScaler ),(void*)10 ); @@ -492,7 +492,7 @@ void HidePreferences( void ) #endif } -#if defined(HAVE_FREETYPE) || defined(HAVE_ICONV) +#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) static void prEntry( GtkContainer * container,gpointer user_data ) { const char * comment; @@ -500,7 +500,7 @@ static void prEntry( GtkContainer * container,gpointer user_data ) switch( (int)user_data ) { -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE case 0: // font encoding comment=gtk_entry_get_text( GTK_ENTRY( EFontEncoding ) ); for ( i=0;lEncoding[i].name;i++ ) @@ -508,7 +508,7 @@ static void prEntry( GtkContainer * container,gpointer user_data ) if ( lEncoding[i].comment ) gtkSet( gtkSetFontEncoding,0,lEncoding[i].name ); break; #endif -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV case 1: // sub encoding comment=gtk_entry_get_text( GTK_ENTRY( ESubEncoding ) ); for ( i=0;lEncoding[i].name;i++ ) @@ -580,7 +580,7 @@ void prButton( GtkButton * button,gpointer user_data ) // --- 4. page guiSetFilename( font_name,gtk_entry_get_text( GTK_ENTRY( prEFontName ) ) ); -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE gtkSet( gtkSetFontFactor,HSFontFactoradj->value,NULL ); #else gtkSet( gtkSetFontBlur,HSFontBluradj->value,NULL ); @@ -684,7 +684,7 @@ static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer u case 4: // sub position sub_pos=(int)HSSubPositionadj->value; break; -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE case 5: // font factor gtkSet( gtkSetFontFactor,HSFontFactoradj->value,NULL ); break; @@ -827,7 +827,7 @@ GtkWidget * create_Preferences( void ) GtkWidget * vbox603; GtkWidget * hbox6; GtkWidget * hbuttonbox5; -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE GtkWidget * hbox7; #endif GtkWidget * vbox601; @@ -1030,7 +1030,7 @@ GtkWidget * create_Preferences( void ) label=AddLabel( MSGTR_PREFERENCES_SUB_FPS,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV label=AddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); #endif @@ -1051,7 +1051,7 @@ GtkWidget * create_Preferences( void ) gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( HSSubFPS ),TRUE ); gtk_table_attach( GTK_TABLE( table1 ),HSSubFPS,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV CBSubEncoding=gtk_combo_new(); gtk_widget_set_name( CBSubEncoding,"CBSubEncoding" ); gtk_widget_show( CBSubEncoding ); @@ -1117,7 +1117,7 @@ GtkWidget * create_Preferences( void ) gtk_container_set_border_width( GTK_CONTAINER( hbuttonbox5 ),3 ); BLoadFont=AddButton( MSGTR_Browse,hbuttonbox5 ); -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE hbox7=AddHBox( vbox603,1 ); AddLabel( MSGTR_PREFERENCES_FontFactor,hbox7 ); HSFontFactoradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10,0.05,0,0 ) ); diff --git a/libass/ass.c b/libass/ass.c index 3f78afa994..1ee81773b3 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -32,7 +32,7 @@ #include <unistd.h> #include <inttypes.h> -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> #endif @@ -810,7 +810,7 @@ void ass_process_chunk(ass_track_t* track, char *data, int size, long long timec free(str); } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV /** \brief recode buffer to utf-8 * constraint: codepage != 0 * \param data pointer to text buffer @@ -826,7 +826,7 @@ static char* sub_recode(char* data, size_t size, char* codepage) { const char* cp_tmp = codepage; -#ifdef HAVE_ENCA +#ifdef CONFIG_ENCA char enca_lang[3], enca_fallback[100]; if (sscanf(codepage, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 || sscanf(codepage, "ENCA:%2s:%99s", enca_lang, enca_fallback) == 2) { @@ -991,7 +991,7 @@ ass_track_t* ass_read_memory(ass_library_t* library, char* buf, size_t bufsize, if (!buf) return 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (codepage) buf = sub_recode(buf, bufsize, codepage); if (!buf) @@ -1017,7 +1017,7 @@ char* read_file_recode(char* fname, char* codepage, int* size) buf = read_file(fname, &bufsize); if (!buf) return 0; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (codepage) { char* tmpbuf = sub_recode(buf, bufsize, codepage); free(buf); @@ -1071,7 +1071,7 @@ int ass_read_styles(ass_track_t* track, char* fname, char* codepage) buf = read_file(fname, &sz); if (!buf) return 1; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (codepage) { char* tmpbuf; tmpbuf = sub_recode(buf, sz, codepage); diff --git a/libass/ass_font.c b/libass/ass_font.c index f70b7c59e3..f2214a345d 100644 --- a/libass/ass_font.c +++ b/libass/ass_font.c @@ -284,7 +284,7 @@ FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch break; } -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if (index == 0) { int face_idx; mp_msg(MSGT_ASS, MSGL_INFO, MSGTR_LIBASS_GlyphNotFoundReselectingFont, diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index 6cf59ff144..fa15087652 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -37,13 +37,13 @@ #include "ass_library.h" #include "ass_fontconfig.h" -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #include <fontconfig/fcfreetype.h> #endif struct fc_instance_s { -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG FcConfig* config; #endif char* family_default; @@ -51,7 +51,7 @@ struct fc_instance_s { int index_default; }; -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG // 4yo fontconfig does not have these. // They are only needed for debug output, anyway. @@ -474,7 +474,7 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con return priv; } -#else // HAVE_FONTCONFIG +#else /* CONFIG_FONTCONFIG */ char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index, uint32_t code) diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index 83e6123543..e9a1ce1567 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -28,7 +28,7 @@ #include <ft2build.h> #include FT_FREETYPE_H -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #endif diff --git a/libass/ass_mp.c b/libass/ass_mp.c index 2e56a93518..ae6d3943e0 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -32,7 +32,7 @@ #include "ass_mp.h" #include "ass_library.h" -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #endif @@ -55,7 +55,7 @@ char* ass_border_color = NULL; char* ass_styles_file = NULL; int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG extern int font_fontconfig; #else static int font_fontconfig = -1; @@ -65,7 +65,7 @@ extern char* sub_font_name; extern float text_font_scale_factor; extern int subtitle_autoscale; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV extern char* sub_cp; #else static char* sub_cp = 0; diff --git a/libmenu/menu.c b/libmenu/menu.c index 39e3b83675..41f33801fc 100644 --- a/libmenu/menu.c +++ b/libmenu/menu.c @@ -215,7 +215,7 @@ int menu_init(struct MPContext *mpctx, char* cfg_file) { char* buffer = NULL; int bl = BUF_STEP, br = 0; int f, fd; -#ifndef HAVE_FREETYPE +#ifndef CONFIG_FREETYPE if(vo_font == NULL) return 0; #endif @@ -403,7 +403,7 @@ static void render_txt(char *txt) } } -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI #include <fribidi/fribidi.h> #include "libavutil/common.h" char *menu_fribidi_charset = NULL; @@ -459,7 +459,7 @@ void menu_draw_text(mp_image_t* mpi,char* txt, int x, int y) { return; } -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI txt = menu_fribidi(txt); #endif render_txt(txt); @@ -493,7 +493,7 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt, return; } -#ifdef HAVE_FRIBIDI +#ifdef CONFIG_FRIBIDI txt = menu_fribidi(txt); #endif render_txt(txt); diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index a3437e194a..d0f8ef0a67 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -202,7 +202,7 @@ static void uninit(vf_instance_t *vf) { static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE // here is the right place to get screen dimensions if (force_load_font) { force_load_font = 0; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 3c5a38bf82..e3480a4e59 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -196,7 +196,7 @@ void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) { mp_msg(MSGT_DEMUX,MSGL_DBG2,"Ogg sub lines: %d first: '%s'\n", ogg_sub.lines, ogg_sub.text[0]); -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_recode(&ogg_sub); #endif vo_sub = &ogg_sub; @@ -745,7 +745,7 @@ int demux_ogg_open(demuxer_t* demuxer) { sh_audio_t* sh_a; sh_video_t* sh_v; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_open(NULL); #endif @@ -1486,7 +1486,7 @@ static void demux_close_ogg(demuxer_t* demuxer) { if(!ogg_d) return; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV subcp_close(); #endif diff --git a/libvo/font_load.h b/libvo/font_load.h index 44832d57f7..df3000efb5 100644 --- a/libvo/font_load.h +++ b/libvo/font_load.h @@ -1,7 +1,7 @@ #ifndef MPLAYER_FONT_LOAD_H #define MPLAYER_FONT_LOAD_H -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE #include <ft2build.h> #include FT_FREETYPE_H #endif @@ -10,14 +10,14 @@ typedef struct { unsigned char *bmp; unsigned char *pal; int w,h,c; -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE int charwidth,charheight,pen,baseline,padding; int current_count, current_alloc; #endif } raw_file; typedef struct font_desc { -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE int dynamic; #endif char *name; @@ -34,7 +34,7 @@ typedef struct font_desc { short width[65536]; int freetype; -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE int face_cnt; FT_Face faces[16]; @@ -64,7 +64,7 @@ typedef struct font_desc { extern font_desc_t* vo_font; extern font_desc_t* sub_font; -#ifdef HAVE_FREETYPE +#ifdef CONFIG_FREETYPE extern char *subtitle_font_encoding; extern float text_font_scale_factor; diff --git a/libvo/font_load_ft.c b/libvo/font_load_ft.c index 63368f3f77..f5926ca277 100644 --- a/libvo/font_load_ft.c +++ b/libvo/font_load_ft.c @@ -16,7 +16,7 @@ #include <math.h> #include <string.h> -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV #include <iconv.h> #endif @@ -24,7 +24,7 @@ #include FT_FREETYPE_H #include FT_GLYPH_H -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG #include <fontconfig/fontconfig.h> #endif @@ -716,7 +716,7 @@ static int generate_tables(font_desc_t *desc, double thickness, double radius) return 0; } -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV /* decode from 'encoding' to unicode */ static FT_ULong decode_char(iconv_t *cd, char c) { FT_ULong o; @@ -1009,7 +1009,7 @@ font_desc_t* read_font_desc_ft(const char *fname, int movie_width, int movie_hei } desc->face_cnt++; -#ifdef HAVE_ICONV +#ifdef CONFIG_ICONV if (unicode) { charset_size = prepare_charset_unicode(face, my_charset, my_charcodes); } else { @@ -1124,7 +1124,7 @@ int done_freetype(void) void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_name, float font_scale_factor) { -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG FcPattern *fc_pattern; FcPattern *fc_pattern2; FcChar8 *s; @@ -1139,7 +1139,7 @@ void load_font_ft(int width, int height, font_desc_t** fontp, const char *font_n if (vo_font) free_font_desc(vo_font); -#ifdef HAVE_FONTCONFIG +#ifdef CONFIG_FONTCONFIG if (font_fontconfig > 0) { if (!font_name) diff --git a/libvo/sub.c b/libvo/sub.c index b87f15c9bc..dffc5f79ab 100644 |