diff options
Diffstat (limited to 'gui')
-rw-r--r-- | gui/cfg.c | 16 | ||||
-rw-r--r-- | gui/interface.c | 24 | ||||
-rw-r--r-- | gui/interface.h | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/fs.c | 2 | ||||
-rw-r--r-- | gui/mplayer/gtk/menu.c | 6 | ||||
-rw-r--r-- | gui/mplayer/gtk/opts.c | 70 | ||||
-rw-r--r-- | gui/mplayer/gui_common.c | 4 | ||||
-rw-r--r-- | gui/mplayer/mw.c | 4 | ||||
-rw-r--r-- | gui/mplayer/play.c | 6 | ||||
-rw-r--r-- | gui/skin/skin.c | 6 | ||||
-rw-r--r-- | gui/win32/gui.c | 8 | ||||
-rw-r--r-- | gui/win32/interface.c | 4 | ||||
-rw-r--r-- | gui/wm/ws.c | 20 | ||||
-rw-r--r-- | gui/wm/ws.h | 2 |
14 files changed, 87 insertions, 87 deletions
@@ -58,12 +58,12 @@ char * gtkAOOSSMixer; char * gtkAOOSSMixerChannel; char * gtkAOOSSDevice; #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA char * gtkAOALSAMixer; char * gtkAOALSAMixerChannel; char * gtkAOALSADevice; #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL char * gtkAOSDLDriver; #endif #ifdef CONFIG_ESD @@ -76,7 +76,7 @@ int gtkCacheSize = 2048; int gtkAutoSyncOn = 0; int gtkAutoSync = 0; -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 char * gtkDXR3Device; #endif @@ -111,7 +111,7 @@ static const m_option_t gui_opts[] = { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL }, { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL }, { "vo_direct_render",&vo_directrendering,CONF_TYPE_FLAG,0,0,1,NULL }, -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 { "vo_dxr3_device",>kDXR3Device,CONF_TYPE_STRING,0,0,0,NULL }, #endif @@ -139,12 +139,12 @@ static const m_option_t gui_opts[] = { "ao_oss_mixer_channel",>kAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_oss_device",>kAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL }, #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA { "ao_alsa_mixer",>kAOALSAMixer,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_alsa_mixer_channel",>kAOALSAMixerChannel,CONF_TYPE_STRING,0,0,0,NULL }, { "ao_alsa_device",>kAOALSADevice,CONF_TYPE_STRING,0,0,0,NULL }, #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL { "ao_sdl_subdriver",>kAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL }, #endif #ifdef CONFIG_ESD @@ -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 a0e5ae72c5..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 @@ -185,7 +185,7 @@ void guiInit( void ) guiIntfStruct.StreamType=-1; memset( >kEquChannels,0,sizeof( gtkEquChannels ) ); -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" ); #endif if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; } @@ -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 ) @@ -616,7 +616,7 @@ int guiGetEvent( int type,char * arg ) guiGetEvent( guiSetDVD,(char *)stream->priv ); break; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: { int i; @@ -706,7 +706,7 @@ int guiGetEvent( int type,char * arg ) } } // -- subtitle -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS #ifdef CONFIG_LIBAVCODEC && !gtkVfLAVC @@ -743,7 +743,7 @@ int guiGetEvent( int type,char * arg ) { case STREAMTYPE_PLAYLIST: break; -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: { char tmp[512]; @@ -795,7 +795,7 @@ int guiGetEvent( int type,char * arg ) } } -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 #ifdef CONFIG_LIBAVCODEC remove_vf( "lavc" ); #endif @@ -842,7 +842,7 @@ int guiGetEvent( int type,char * arg ) free(tmp); } #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"alsa",4 ) ) { char *tmp; @@ -857,7 +857,7 @@ int guiGetEvent( int type,char * arg ) free(tmp); } #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"sdl",3 ) ) { char *tmp; @@ -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 ); @@ -1125,7 +1125,7 @@ void * gtkSet( int cmd,float fparam, void * vparam ) #ifdef CONFIG_DVDREAD if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) ); #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD if ( (unsigned int)vparam & guiVCD ) guiIntfStruct.VCDTracks=0; #endif return NULL; diff --git a/gui/interface.h b/gui/interface.h index 372c888d15..a739d2c640 100644 --- a/gui/interface.h +++ b/gui/interface.h @@ -90,7 +90,7 @@ typedef struct int Chapter; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD int VCDTracks; #endif 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/menu.c b/gui/mplayer/gtk/menu.c index d54d4fe1e3..beac3325c1 100644 --- a/gui/mplayer/gtk/menu.c +++ b/gui/mplayer/gtk/menu.c @@ -72,7 +72,7 @@ #include "../pixmaps/tonguebla.xpm" #include "../pixmaps/empty1px.xpm" #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD #include "../pixmaps/vcd.xpm" #include "../pixmaps/playvcd.xpm" #endif @@ -421,7 +421,7 @@ GtkWidget * create_PopUpMenu( void ) AddSeparator( Menu ); SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open ); AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile" ", evLoadPlay ); -#ifdef HAVE_VCD +#ifdef CONFIG_VCD AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD ); #endif #ifdef CONFIG_DVDREAD @@ -446,7 +446,7 @@ GtkWidget * create_PopUpMenu( void ) // AddMenuItem( SubMenu,MSGTR_MENU_NormalSize" ", evNormalSize ); // AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize ); // AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen ); -#ifdef HAVE_VCD +#ifdef CONFIG_VCD VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD ); AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD ); AddSeparator( VCDSubMenu ); diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c index 281f49de71..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; @@ -178,7 +178,7 @@ static char * ao_driver[3]; static char * vo_driver[3]; static int old_video_driver = 0; -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 void ShowDXR3Config( void ); void HideDXR3Config( void ); #endif @@ -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 @@ -271,7 +271,7 @@ void ShowPreferences( void ) gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 ); gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver ); gtk_widget_set_sensitive( VConfig,FALSE ); -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); #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 ); @@ -487,12 +487,12 @@ void HidePreferences( void ) gtk_widget_destroy( Preferences ); Preferences=NULL; HideAudioConfig(); -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 HideDXR3Config(); #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 ); @@ -649,7 +649,7 @@ void prButton( GtkButton * button,gpointer user_data ) case bVconfig: if ( !vo_driver[0] ) break; gtk_widget_set_sensitive( VConfig,FALSE ); -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 if ( !gstrcmp( vo_driver[0],"dxr3" ) ) { ShowDXR3Config(); gtk_widget_set_sensitive( VConfig,TRUE ); } #endif break; @@ -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; @@ -790,7 +790,7 @@ static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,g case 1: // video driver gtk_clist_get_text( GTK_CLIST( CLVDrivers ),row,0,(char **)&vo_driver ); gtk_widget_set_sensitive( VConfig,FALSE ); -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 if ( !gstrcmp( vo_driver[0],"dxr3" ) ) gtk_widget_set_sensitive( VConfig,TRUE ); #endif 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 ) ); @@ -1388,7 +1388,7 @@ GList *appendOSSDevices(GList *l) { l = g_list_append(l, (gpointer)"/dev/dsp2"); l = g_list_append(l, (gpointer)"/dev/dsp3"); } -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 l = g_list_append(l, (gpointer)"/dev/em8300_ma"); l = g_list_append(l, (gpointer)"/dev/em8300_ma-0"); l = g_list_append(l, (gpointer)"/dev/em8300_ma-1"); @@ -1423,7 +1423,7 @@ GList *appendOSSMixerChannels(GList *l) { } #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA GList *appendALSADevices(GList *l) { l = g_list_append(l, (gpointer)"default"); l = g_list_append(l, (gpointer)"hw=0.0"); @@ -1450,7 +1450,7 @@ GList *appendALSAMixerChannels(GList *l) { } #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL GList *appendSDLDevices(GList *l) { l = g_list_append(l, (gpointer)"alsa"); l = g_list_append(l, (gpointer)"arts"); @@ -1510,14 +1510,14 @@ void ShowAudioConfig() { setGtkEntryText(CEAudioMixerChannel, gtkAOOSSMixerChannel); } #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (strncmp(ao_driver[0], "alsa", 4) == 0) { setGtkEntryText(CEAudioDevice, gtkAOALSADevice); setGtkEntryText(CEAudioMixer, gtkAOALSAMixer); setGtkEntryText(CEAudioMixerChannel, gtkAOALSAMixerChannel); } #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL if (strncmp(ao_driver[0], "sdl", 3) == 0) { setGtkEntryText(CEAudioDevice, gtkAOSDLDriver); } @@ -1552,7 +1552,7 @@ static void audioButton(GtkButton *button, gpointer user_data) { gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel)); } #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (strncmp(ao_driver[0], "alsa", 4) == 0) { gfree(>kAOALSADevice); gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice)); @@ -1562,7 +1562,7 @@ static void audioButton(GtkButton *button, gpointer user_data) { gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel)); } #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL if (strncmp(ao_driver[0], "sdl", 3) == 0) { gfree(>kAOSDLDriver); gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice)); @@ -1616,11 +1616,11 @@ GtkWidget *create_AudioConfig() { if (strncmp(ao_driver[0], "oss", 3) == 0) items = appendOSSDevices(items); #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (strncmp(ao_driver[0], "alsa", 4) == 0) items = appendALSADevices(items); #endif -#ifdef HAVE_SDL +#ifdef CONFIG_SDL if (strncmp(ao_driver[0], "sdl", 3) == 0) items = appendSDLDevices(items); #endif @@ -1646,7 +1646,7 @@ GtkWidget *create_AudioConfig() { if (strncmp(ao_driver[0], "oss", 3) == 0) items = appendOSSMixers(items); #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (strncmp(ao_driver[0], "alsa", 4) == 0) items = appendALSAMixers(items); #endif @@ -1668,7 +1668,7 @@ GtkWidget *create_AudioConfig() { if (strncmp(ao_driver[0], "oss", 3) == 0) items = appendOSSMixerChannels(items); #endif -#if defined(HAVE_ALSA9) || defined (HAVE_ALSA1X) +#ifdef CONFIG_ALSA if (strncmp(ao_driver[0], "alsa", 4) == 0) items = appendALSAMixerChannels(items); #endif @@ -1700,7 +1700,7 @@ GtkWidget *create_AudioConfig() { return AudioConfig; } -#ifdef HAVE_DXR3 +#ifdef CONFIG_DXR3 // --- dxr3 config box static GtkWidget * DXR3Config; diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c index b422fc4a0b..957e85d3b1 100644 --- a/gui/mplayer/gui_common.c +++ b/gui/mplayer/gui_common.c @@ -77,7 +77,7 @@ static inline void TranslateFilename( int c,char * tmp,size_t tmplen ) else av_strlcat( tmp,MSGTR_NoChapter,tmplen ); break; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track ); break; @@ -174,7 +174,7 @@ calclengthmmmmss: switch ( guiIntfStruct.StreamType ) { case STREAMTYPE_FILE: av_strlcat( trbuf,"f",sizeof( trbuf ) ); break; -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: av_strlcat( trbuf,"v",sizeof( trbuf ) ); break; #endif case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break; diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c index d6d269eb52..6f8866c640 100644 --- a/gui/mplayer/mw.c +++ b/gui/mplayer/mw.c @@ -128,7 +128,7 @@ void mplEventHandling( int msg,float param ) mp_property_do("sub",M_PROPERTY_SET,&iparam,guiIntfStruct.mpcontext); break; -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case evSetVCDTrack: guiIntfStruct.Track=iparam; case evPlayVCD: @@ -165,7 +165,7 @@ play: case STREAMTYPE_FILE: gtkSet( gtkClearStruct,0,(void *)(guiALL - guiFilenames) ); break; -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: gtkSet( gtkClearStruct,0,(void *)(guiALL - guiVCD - guiFilenames) ); if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE ); diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c index a06370c2b8..63b639d5d1 100644 --- a/gui/mplayer/play.c +++ b/gui/mplayer/play.c @@ -296,7 +296,7 @@ void mplCurr( void ) case STREAMTYPE_DVD: break; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: break; #endif @@ -332,7 +332,7 @@ void mplPrev( void ) guiIntfStruct.Track=guiIntfStruct.DVD.current_title; break; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: if ( --guiIntfStruct.Track == 0 ) { guiIntfStruct.Track=1; stop=1; } break; @@ -368,7 +368,7 @@ void mplNext( void ) guiIntfStruct.Track=guiIntfStruct.DVD.current_title; break; #endif -#ifdef HAVE_VCD +#ifdef CONFIG_VCD case STREAMTYPE_VCD: if ( ++guiIntfStruct.Track > guiIntfStruct.VCDTracks ) { guiIntfStruct.Track=guiIntfStruct.VCDTracks; stop=1; } break; diff --git a/gui/skin/skin.c b/gui/skin/skin.c index c5a6ec0b92..064bde68cb 100644 --- a/gui/skin/skin.c +++ b/gui/skin/skin.c @@ -169,7 +169,7 @@ int cmd_base( char * in ) if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1; defList->main.width=defList->main.Bitmap.Width; defList->main.height=defList->main.Bitmap.Height; -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE Convert32to1( &defList->main.Bitmap,&defList->main.Mask,0x00ff00ff ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->main.Mask.Width,defList->main.Mask.Height ); #else @@ -201,7 +201,7 @@ int cmd_base( char * in ) if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1; defList->menuBase.width=defList->menuBase.Bitmap.Width; defList->menuBase.height=defList->menuBase.Bitmap.Height; -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE Convert32to1( &defList->menuBase.Bitmap,&defList->menuBase.Mask,0x00ff00ff ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->menuBase.Mask.Width,defList->menuBase.Mask.Height ); #else @@ -219,7 +219,7 @@ int cmd_base( char * in ) if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1; defList->bar.width=defList->bar.Bitmap.Width; defList->bar.height=defList->bar.Bitmap.Height; -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE Convert32to1( &defList->bar.Bitmap,&defList->bar.Mask,0x00ff00ff ); mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[skin] mask: %dx%d\n",defList->bar.Mask.Width,defList->bar.Mask.Height ); #else diff --git a/gui/win32/gui.c b/gui/win32/gui.c index a56a4c77a7..35268938a6 100644 --- a/gui/win32/gui.c +++ b/gui/win32/gui.c @@ -804,7 +804,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM char device[MAX_PATH]; char searchpath[MAX_PATH]; char searchpath2[MAX_PATH]; -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO char searchpath3[MAX_PATH]; #endif int len, pos = 0, cdromdrive = 0; @@ -826,14 +826,14 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM mp_msg(MSGT_GPLAYER, MSGL_V, "[GUI] checking %s for CD/VCD/SVCD/DVDs\n", device + pos); sprintf(searchpath, "%sVIDEO_TS", device + pos); sprintf(searchpath2, "%sMpegav", device + pos); -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO sprintf(searchpath3, "%sTrack01.cda", device + pos); #endif if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; else if(GetFileAttributes(searchpath2) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO else if(GetFileAttributes(searchpath3) != INVALID_FILE_ATTRIBUTES) flags |= MF_ENABLED; #endif @@ -1015,7 +1015,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM sprintf(searchpath, "%sTrack01.cda", device + pos); if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES) { -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO if (cdrom_device) free(cdrom_device); cdrom_device = strdup(device + pos); /* mplayer doesn't seem to like the trailing \ after the device name */ diff --git a/gui/win32/interface.c b/gui/win32/interface.c index 6b3eaafc54..209a1889d4 100644 --- a/gui/win32/interface.c +++ b/gui/win32/interface.c @@ -41,7 +41,7 @@ #include "access_mpcontext.h" #include "gui.h" #include "dialogs.h" -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO #include <cdio/cdio.h> #endif @@ -173,7 +173,7 @@ static void guiSetEvent(int event) break; } #endif -#ifdef HAVE_LIBCDIO +#ifdef CONFIG_LIBCDIO case evPlayCD: { int i; diff --git a/gui/wm/ws.c b/gui/wm/ws.c index 34aa58c842..65ec992d58 100644 --- a/gui/wm/ws.c +++ b/gui/wm/ws.c @@ -48,15 +48,15 @@ #include "wsxdnd.h" #include <X11/extensions/XShm.h> -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE #include <X11/extensions/shape.h> #endif -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA #include <X11/extensions/Xinerama.h> #endif -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM #include <X11/extensions/xf86vmode.h> #endif @@ -235,7 +235,7 @@ wsXDNDInitialize(); mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshm ); wsUseXShm=0; } -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE if ( !XShapeQueryExtension( wsDisplay,&eventbase,&errorbase ) ) { mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_WS_NoXshape ); @@ -249,7 +249,7 @@ wsXDNDInitialize(); wsScreen=DefaultScreen( wsDisplay ); wsRootWin=RootWindow( wsDisplay,wsScreen ); -#ifdef HAVE_XF86VM +#ifdef CONFIG_XF86VM { int clock; XF86VidModeModeLine modeline; @@ -278,7 +278,7 @@ wsXDNDInitialize(); int minor,major,shp; mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Screen depth: %d\n",wsDepthOnScreen ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] size: %dx%d\n",wsMaxX,wsMaxY ); -#ifdef HAVE_XINERAMA +#ifdef CONFIG_XINERAMA mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] origin: +%d+%d\n",wsOrgX,wsOrgY ); #endif mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] red mask: 0x%x\n",wsRedMask ); @@ -289,7 +289,7 @@ wsXDNDInitialize(); XShmQueryVersion( wsDisplay,&major,&minor,&shp ); mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] XShm version is %d.%d\n",major,minor ); } - #ifdef HAVE_XSHAPE + #ifdef CONFIG_XSHAPE if ( wsUseXShape ) { XShapeQueryVersion( wsDisplay,&major,&minor ); @@ -1220,7 +1220,7 @@ static int timeout_save=0; void wsScreenSaverOn( Display *mDisplay ) { int nothing; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if ( dpms_disabled ) { if ( DPMSQueryExtension( mDisplay,¬hing,¬hing ) ) @@ -1250,7 +1250,7 @@ void wsScreenSaverOn( Display *mDisplay ) void wsScreenSaverOff( Display * mDisplay ) { int interval,prefer_blank,allow_exp,nothing; -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS if ( DPMSQueryExtension( mDisplay,¬hing,¬hing ) ) { BOOL onoff; @@ -1273,7 +1273,7 @@ void wsScreenSaverOff( Display * mDisplay ) void wsSetShape( wsTWindow * win,char * data ) { -#ifdef HAVE_XSHAPE +#ifdef CONFIG_XSHAPE if ( !wsUseXShape ) return; if ( data ) { diff --git a/gui/wm/ws.h b/gui/wm/ws.h index e782edd6d3..73321c6ae9 100644 --- a/gui/wm/ws.h +++ b/gui/wm/ws.h @@ -27,7 +27,7 @@ #include <X11/keysym.h> #include <X11/Xatom.h> #include <X11/extensions/XShm.h> -#ifdef HAVE_XDPMS +#ifdef CONFIG_XDPMS #include <X11/extensions/dpms.h> #endif |