summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-30 12:01:30 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-07-30 12:01:30 +0000
commit4b141479da70665db8d5780c9ca9e430c9dd1f09 (patch)
tree9f61bb3b6989d4049f57a4d360d9e9b4d0047e9d /gui
parentcbe1fcbf8309755549d01cec871c84316432ab8c (diff)
downloadmpv-4b141479da70665db8d5780c9ca9e430c9dd1f09.tar.bz2
mpv-4b141479da70665db8d5780c9ca9e430c9dd1f09.tar.xz
Start unifying names of internal preprocessor directives.
Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'gui')
-rw-r--r--gui/cfg.c18
-rw-r--r--gui/cfg.h2
-rw-r--r--gui/interface.c32
-rw-r--r--gui/interface.h6
-rw-r--r--gui/mplayer/gtk/menu.c8
-rw-r--r--gui/mplayer/gtk/opts.c56
-rw-r--r--gui/mplayer/gui_common.c4
-rw-r--r--gui/mplayer/mw.c8
-rw-r--r--gui/mplayer/play.c8
-rw-r--r--gui/win32/dialogs.c2
-rw-r--r--gui/win32/gui.c6
-rw-r--r--gui/win32/interface.c20
-rw-r--r--gui/win32/widgetrender.c2
13 files changed, 86 insertions, 86 deletions
diff --git a/gui/cfg.c b/gui/cfg.c
index f14ff6110e..c70d95bff3 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -45,7 +45,7 @@
int gtkEnableAudioEqualizer = 0;
int gtkVfPP = 0;
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
int gtkVfLAVC = 0;
#endif
@@ -53,7 +53,7 @@ int gtkAONorm = 0;
int gtkAOSurround = 0;
int gtkAOExtraStereo = 0;
float gtkAOExtraStereoMul = 1.0;
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
char * gtkAOOSSMixer;
char * gtkAOOSSMixerChannel;
char * gtkAOOSSDevice;
@@ -66,7 +66,7 @@ char * gtkAOALSADevice;
#ifdef HAVE_SDL
char * gtkAOSDLDriver;
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
char * gtkAOESDDevice;
#endif
@@ -93,7 +93,7 @@ int gui_main_pos_y = -2;
int gui_sub_pos_x = -1;
int gui_sub_pos_y = -1;
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
gtkASS_t gtkASS;
#endif
// ---
@@ -124,7 +124,7 @@ static const m_option_t gui_opts[] =
{ "vf_pp",&gtkVfPP,CONF_TYPE_FLAG,0,0,1,NULL },
{ "vf_autoq",&auto_quality,CONF_TYPE_INT,CONF_RANGE,0,100,NULL },
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
{ "vf_lavc",&gtkVfLAVC,CONF_TYPE_FLAG,0,0,1,NULL },
#endif
@@ -134,7 +134,7 @@ static const m_option_t gui_opts[] =
{ "ao_surround",&gtkAOSurround,CONF_TYPE_FLAG,0,0,1,NULL },
{ "ao_extra_stereo",&gtkAOExtraStereo,CONF_TYPE_FLAG,0,0,1,NULL },
{ "ao_extra_stereo_coefficient",&gtkAOExtraStereoMul,CONF_TYPE_FLOAT,CONF_RANGE,-10,10,NULL },
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
{ "ao_oss_mixer",&gtkAOOSSMixer,CONF_TYPE_STRING,0,0,0,NULL },
{ "ao_oss_mixer_channel",&gtkAOOSSMixerChannel,CONF_TYPE_STRING,0,0,0,NULL },
{ "ao_oss_device",&gtkAOOSSDevice,CONF_TYPE_STRING,0,0,0,NULL },
@@ -147,7 +147,7 @@ static const m_option_t gui_opts[] =
#ifdef HAVE_SDL
{ "ao_sdl_subdriver",&gtkAOSDLDriver,CONF_TYPE_STRING,0,0,0,NULL },
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
{ "ao_esd_device",&gtkAOESDDevice,CONF_TYPE_STRING,0,0,0,NULL },
#endif
@@ -157,7 +157,7 @@ static const m_option_t gui_opts[] =
{ "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
{ "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },
{ "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
{ "ass_enabled",&ass_enabled,CONF_TYPE_FLAG,0,0,1,NULL },
{ "ass_use_margins",&ass_use_margins,CONF_TYPE_FLAG,0,0,1,NULL },
{ "ass_top_margin",&ass_top_margin,CONF_TYPE_INT,CONF_RANGE,0,512,NULL },
@@ -165,7 +165,7 @@ 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 USE_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 },
diff --git a/gui/cfg.h b/gui/cfg.h
index c04d4614bf..8bd8fcc856 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -63,7 +63,7 @@ extern int gui_main_pos_y;
extern int gui_sub_pos_x;
extern int gui_sub_pos_y;
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
typedef struct {
int enabled;
int use_margins;
diff --git a/gui/interface.c b/gui/interface.c
index 7d5a3581d6..5884e7befb 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -51,7 +51,7 @@
extern af_cfg_t af_cfg;
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
#include <iconv.h>
#endif
@@ -60,7 +60,7 @@ extern af_cfg_t af_cfg;
#include "libmpdemux/stheader.h"
#include "libmpcodecs/dec_video.h"
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
#include "stream/stream_dvd.h"
#endif
@@ -192,7 +192,7 @@ void guiInit( void )
else if ( stream_cache_size == 0 ) gtkCacheOn = 0;
if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; }
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
gtkASS.enabled = ass_enabled;
gtkASS.use_margins = ass_use_margins;
gtkASS.top_margin = ass_top_margin;
@@ -370,7 +370,7 @@ void guiDone( void )
gui_sub_pos_x=appMPlayer.subWindow.X; gui_sub_pos_y=appMPlayer.subWindow.Y;
}
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
ass_enabled = gtkASS.enabled;
ass_use_margins = gtkASS.use_margins;
ass_top_margin = gtkASS.top_margin;
@@ -528,7 +528,7 @@ int guiGetEvent( int type,char * arg )
mixer_t *mixer = NULL;
stream_t * stream = (stream_t *) arg;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
dvd_priv_t * dvdp = (dvd_priv_t *) arg;
#endif
@@ -592,7 +592,7 @@ int guiGetEvent( int type,char * arg )
wsMoveWindow( &appMPlayer.mainWindow,0,0, vo_dheight);
}
break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case guiSetDVD:
guiIntfStruct.DVD.titles=dvdp->vmg_file->tt_srpt->nr_of_srpts;
guiIntfStruct.DVD.chapters=dvdp->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts;
@@ -611,7 +611,7 @@ int guiGetEvent( int type,char * arg )
guiIntfStruct.StreamType=stream->type;
switch( stream->type )
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
guiGetEvent( guiSetDVD,(char *)stream->priv );
break;
@@ -708,7 +708,7 @@ int guiGetEvent( int type,char * arg )
// -- subtitle
#ifdef HAVE_DXR3
if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) && guiIntfStruct.FileFormat != DEMUXER_TYPE_MPEG_PS
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
&& !gtkVfLAVC
#endif
)
@@ -752,7 +752,7 @@ int guiGetEvent( int type,char * arg )
}
break;
#endif
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
{
char tmp[512];
@@ -796,14 +796,14 @@ int guiGetEvent( int type,char * arg )
}
#ifdef HAVE_DXR3
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
remove_vf( "lavc" );
#endif
if ( video_driver_list && !gstrcmp( video_driver_list[0],"dxr3" ) )
{
if ( ( guiIntfStruct.StreamType != STREAMTYPE_DVD)&&( guiIntfStruct.StreamType != STREAMTYPE_VCD ) )
{
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
if ( gtkVfLAVC ) add_vf( "lavc" );
#endif
}
@@ -827,7 +827,7 @@ int guiGetEvent( int type,char * arg )
greplace(&af_cfg.list, "extrastereo", name);
free(name);
}
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"oss",3 ) )
{
char *tmp;
@@ -870,7 +870,7 @@ int guiGetEvent( int type,char * arg )
free(tmp);
}
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
if ( audio_driver_list && !gstrncmp( audio_driver_list[0],"esd",3 ) )
{
char *tmp;
@@ -903,7 +903,7 @@ int guiGetEvent( int type,char * arg )
guiIntfStruct.FilenameChanged=0;
guiIntfStruct.NewPlay=0;
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
ass_enabled = gtkASS.enabled;
ass_use_margins = gtkASS.use_margins;
ass_top_margin = gtkASS.top_margin;
@@ -1107,7 +1107,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
guiLoadFont();
return NULL;
#endif
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
case gtkSetSubEncoding:
gfree( (void **)&sub_cp );
sub_cp=gstrdup( (char *)vparam );
@@ -1122,7 +1122,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
gfree( (void **)&guiIntfStruct.AudioFile );
gtkSet( gtkDelPl,0,NULL );
}
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
if ( (unsigned int)vparam & guiDVD ) memset( &guiIntfStruct.DVD,0,sizeof( guiDVDStruct ) );
#endif
#ifdef HAVE_VCD
diff --git a/gui/interface.h b/gui/interface.h
index 4b39511b93..372c888d15 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -24,7 +24,7 @@
#include "libvo/font_load.h"
#include "cfg.h"
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
#include "stream/stream.h"
#endif
@@ -51,7 +51,7 @@ typedef struct
char codecdll[128];
} guiVideoStruct;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
typedef struct
{
int titles;
@@ -83,7 +83,7 @@ typedef struct
int DiskChanged;
int NewPlay;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
guiDVDStruct DVD;
int Title;
int Angle;
diff --git a/gui/mplayer/gtk/menu.c b/gui/mplayer/gtk/menu.c
index eefae6b31e..d54d4fe1e3 100644
--- a/gui/mplayer/gtk/menu.c
+++ b/gui/mplayer/gtk/menu.c
@@ -63,7 +63,7 @@
#include "../pixmaps/empty.xpm"
#include "../pixmaps/loadeaf.xpm"
#include "../pixmaps/title.xpm"
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
#include "../pixmaps/dvd.xpm"
#include "../pixmaps/playdvd.xpm"
#include "../pixmaps/chapter.xpm"
@@ -377,7 +377,7 @@ static Languages_t Languages[] =
};
#undef lng
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
static char * ChannelTypes[] =
{ "Dolby Digital","","Mpeg1","Mpeg2","PCM","","Digital Theatre System" };
static char * ChannelNumbers[] =
@@ -424,7 +424,7 @@ GtkWidget * create_PopUpMenu( void )
#ifdef HAVE_VCD
AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD );
#endif
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
AddMenuItem( window1, (const char*)playdvd_xpm, SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD );
#endif
AddMenuItem( window1, (const char*)url_xpm, SubMenu,MSGTR_MENU_PlayURL, evSetURL );
@@ -467,7 +467,7 @@ GtkWidget * create_PopUpMenu( void )
gtk_widget_set_sensitive( MenuItem,FALSE );
}
#endif
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
DVDSubMenu=AddSubMenu( window1, (const char*)dvd_xpm, Menu,MSGTR_MENU_DVD );
AddMenuItem( window1, (const char*)playdvd_xpm, DVDSubMenu,MSGTR_MENU_PlayDisc" ", evPlayDVD );
// AddMenuItem( DVDSubMenu,MSGTR_MENU_ShowDVDMenu, evNone );
diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c
index f0cb89731f..feb189171b 100644
--- a/gui/mplayer/gtk/opts.c
+++ b/gui/mplayer/gtk/opts.c
@@ -133,11 +133,11 @@ static GtkWidget * RBFontNoAutoScale, * RBFontAutoScaleWidth, * RBFontAutoSc
//static GtkWidget * AutoScale;
#endif
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
static GtkWidget * CBSubEncoding, * ESubEncoding;
#endif
-#if defined( HAVE_FREETYPE ) || defined( USE_ICONV )
+#if defined(HAVE_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( USE_ICONV )
+#if defined(HAVE_FREETYPE) || defined(CONFIG_ICONV)
static void prEntry( GtkContainer * container,gpointer user_data );
#endif
@@ -284,7 +284,7 @@ void ShowPreferences( void )
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpSrt ),gtkSubDumpSrt );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubUnicode ),sub_unicode );
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBUseASS ),gtkASS.enabled );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBASSUseMargins ),gtkASS.use_margins );
gtk_spin_button_set_value( (GtkSpinButton *)SBASSTopMargin,(gdouble)gtkASS.top_margin );
@@ -312,7 +312,7 @@ void ShowPreferences( void )
if ( guiIntfStruct.Subtitlename ) gtk_entry_set_text( GTK_ENTRY( ESubtitleName ),guiIntfStruct.Subtitlename );
#endif
-#ifdef USE_ICONV
+#ifdef CONFIG_ICONV
if ( sub_cp )
{
int i;
@@ -421,7 +421,7 @@ void ShowPreferences( void )
else gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),DEFAULT_CDROM_DEVICE );
// -- disables
-#ifndef USE_ASS
+#ifndef CONFIG_ASS
gtk_widget_set_sensitive( CBUseASS,FALSE );
gtk_widget_set_sensitive( CBASSUseMargins,FALSE );
gtk_widget_set_sensitive( SBASSTopMargin,FALSE );
@@ -442,7 +442,7 @@ void ShowPreferences( void )
#endif
gtk_signal_connect( GTK_OBJECT( CBCache ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)8);
gtk_signal_connect( GTK_OBJECT( CBAutoSync ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)9);
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
gtk_signal_connect( GTK_OBJECT( CBUseASS ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)10);
#endif
@@ -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 USE_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( USE_ICONV )
+#if defined(HAVE_FREETYPE) || defined(CONFIG_ICONV)
static void prEntry( GtkContainer * container,gpointer user_data )
{
const char * comment;
@@ -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 USE_ICONV
+#ifdef CONFIG_ICONV
case 1: // sub encoding
comment=gtk_entry_get_text( GTK_ENTRY( ESubEncoding ) );
for ( i=0;lEncoding[i].name;i++ )
@@ -563,7 +563,7 @@ void prButton( GtkButton * button,gpointer user_data )
gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) );
gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) );
sub_unicode=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubUnicode ) );
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
gtkASS.enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBUseASS ) );
gtkASS.use_margins=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBASSUseMargins ) );
gtkASS.top_margin=gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( SBASSTopMargin ) );
@@ -751,7 +751,7 @@ static void prToggled( GtkToggleButton * togglebutton,gpointer user_data )
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBAutoSync ) ) ) gtk_widget_set_sensitive( SBAutoSync,TRUE );
else gtk_widget_set_sensitive( SBAutoSync,FALSE );
break;
-#ifdef USE_ASS
+#ifdef CONFIG_ASS
case 10:
if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBUseASS ) ) )
{
@@ -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 USE_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 USE_ICONV
+#ifdef CONFIG_ICONV
CBSubEncoding=gtk_combo_new();
gtk_widget_set_name( CBSubEncoding,"CBSubEncoding" );
gtk_widget_show( CBSubEncoding );
@@ -1373,7 +1373,7 @@ GtkWidget * create_Preferences( void )
return Preferences;
}
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
GList *appendOSSDevices(GList *l) {
// careful! the current implementation allows only string constants!
l = g_list_append(l, (gpointer)"/dev/dsp");
@@ -1462,7 +1462,7 @@ GList *appendSDLDevices(GList *l) {
}
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
GList *appendESDDevices(GList *l) {
l = g_list_append(l, (gpointer)"Enter Remote IP");
l = g_list_append(l, (gpointer)"Use Software Mixer");
@@ -1503,7 +1503,7 @@ void ShowAudioConfig() {
if (AudioConfig) gtkActive(AudioConfig);
else AudioConfig = create_AudioConfig();
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0) {
setGtkEntryText(CEAudioDevice, gtkAOOSSDevice);
setGtkEntryText(CEAudioMixer, gtkAOOSSMixer);
@@ -1522,7 +1522,7 @@ void ShowAudioConfig() {
setGtkEntryText(CEAudioDevice, gtkAOSDLDriver);
}
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
if (strncmp(ao_driver[0], "esd", 3) == 0) {
setGtkEntryText(CEAudioDevice, gtkAOESDDevice);
}
@@ -1542,7 +1542,7 @@ void HideAudioConfig() {
static void audioButton(GtkButton *button, gpointer user_data) {
switch( (int)user_data ) {
case 1:
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0) {
gfree(&gtkAOOSSDevice);
gtkAOOSSDevice = gstrdup(getGtkEntryText(CEAudioDevice));
@@ -1568,7 +1568,7 @@ static void audioButton(GtkButton *button, gpointer user_data) {
gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
}
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
if (strncmp(ao_driver[0], "esd", 3) == 0) {
gfree(&gtkAOESDDevice);
gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice));
@@ -1612,7 +1612,7 @@ GtkWidget *create_AudioConfig() {
CBAudioDevice = AddComboBox(NULL);
gtk_table_attach(GTK_TABLE(table), CBAudioDevice, 1, 2, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0);
items = g_list_append(items,(gpointer)MSGTR_PREFERENCES_DriverDefault);
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSDevices(items);
#endif
@@ -1624,7 +1624,7 @@ GtkWidget *create_AudioConfig() {
if (strncmp(ao_driver[0], "sdl", 3) == 0)
items = appendSDLDevices(items);
#endif
-#ifdef USE_ESD
+#ifdef CONFIG_ESD
if (strncmp(ao_driver[0], "esd", 3) == 0)
items = appendESDDevices(items);
#endif
@@ -1642,7 +1642,7 @@ GtkWidget *create_AudioConfig() {
CBAudioMixer = AddComboBox(NULL);
gtk_table_attach(GTK_TABLE(table), CBAudioMixer, 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0);
items = g_list_append(items, (gpointer)MSGTR_PREFERENCES_DriverDefault);
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSMixers(items);
#endif
@@ -1664,7 +1664,7 @@ GtkWidget *create_AudioConfig() {
CBAudioMixerChannel = AddComboBox(NULL);
gtk_table_attach(GTK_TABLE(table), CBAudioMixerChannel, 1, 2, 2, 3, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0);
items = g_list_append(items, (gpointer)MSGTR_PREFERENCES_DriverDefault);
-#ifdef USE_OSS_AUDIO
+#ifdef CONFIG_OSS_AUDIO
if (strncmp(ao_driver[0], "oss", 3) == 0)
items = appendOSSMixerChannels(items);
#endif
@@ -1707,7 +1707,7 @@ static GtkWidget * DXR3Config;
static GtkWidget * CBDevice;
static GtkWidget * CEDXR3Device;
static GtkWidget * RBVNone;
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
static GtkWidget * RBVLavc;
#endif
static GtkWidget * dxr3BOk;
@@ -1723,7 +1723,7 @@ void ShowDXR3Config( void )
gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVNone ),TRUE );
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
if ( gtkVfLAVC ) gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( RBVLavc ),TRUE );
#endif
@@ -1745,7 +1745,7 @@ static void dxr3Button( GtkButton * button,gpointer user_data )
{
case 0: // Ok
gfree( (void **)&gtkDXR3Device ); gtkDXR3Device=strdup( gtk_entry_get_text( GTK_ENTRY( CEDXR3Device ) ) );
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
gtkVfLAVC=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( RBVLavc ) );
#endif
case 1: // Cancel
@@ -1800,7 +1800,7 @@ GtkWidget * create_DXR3Config( void )
gtk_widget_show( CEDXR3Device );
gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),"/dev/em8300" );
-#ifdef USE_LIBAVCODEC
+#ifdef CONFIG_LIBAVCODEC
AddHSeparator( vbox2 );
vbox3=AddVBox( vbox2,0 );
AddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 );
diff --git a/gui/mplayer/gui_common.c b/gui/mplayer/gui_common.c
index 0bfeb9b805..b422fc4a0b 100644
--- a/gui/mplayer/gui_common.c
+++ b/gui/mplayer/gui_common.c
@@ -71,7 +71,7 @@ static inline void TranslateFilename( int c,char * tmp,size_t tmplen )
if ( tmp[strlen( tmp ) - 5] == '.' ) tmp[strlen( tmp ) - 5]=0;
} else av_strlcpy( tmp,MSGTR_NoFileLoaded,tmplen );
break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
if ( guiIntfStruct.DVD.current_chapter ) snprintf(tmp,tmplen,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter );
else av_strlcat( tmp,MSGTR_NoChapter,tmplen );
@@ -178,7 +178,7 @@ calclengthmmmmss:
case STREAMTYPE_VCD: av_strlcat( trbuf,"v",sizeof( trbuf ) ); break;
#endif
case STREAMTYPE_STREAM: av_strlcat( trbuf,"u",sizeof( trbuf ) ); break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD: av_strlcat( trbuf,"d",sizeof( trbuf ) ); break;
#endif
default: av_strlcat( trbuf," ",sizeof( trbuf ) ); break;
diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c
index c5b63ecd57..d6d269eb52 100644
--- a/gui/mplayer/mw.c
+++ b/gui/mplayer/mw.c
@@ -136,7 +136,7 @@ void mplEventHandling( int msg,float param )
guiIntfStruct.StreamType=STREAMTYPE_VCD;
goto play;
#endif
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case evPlayDVD:
guiIntfStruct.DVD.current_title=1;
guiIntfStruct.DVD.current_chapter=1;
@@ -181,7 +181,7 @@ play:
}
break;
#endif
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
gtkSet( gtkClearStruct,0,(void *)(guiALL - guiDVD - guiFilenames) );
if ( !dvd_device ) dvd_device=gstrdup( DEFAULT_DVD_DEVICE );
@@ -199,7 +199,7 @@ play:
guiIntfStruct.NewPlay=1;
mplPlay();
break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case evSetDVDSubtitle:
dvdsub_id=iparam;
goto play_dvd_2;
@@ -356,7 +356,7 @@ set_volume:
default: movie_aspect=-1;
}
wsClearWindow( appMPlayer.subWindow );
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
if ( guiIntfStruct.StreamType == STREAMTYPE_DVD || guiIntfStruct.StreamType == STREAMTYPE_VCD ) goto play_dvd_2;
else
#endif
diff --git a/gui/mplayer/play.c b/gui/mplayer/play.c
index 2e7f379324..a06370c2b8 100644
--- a/gui/mplayer/play.c
+++ b/gui/mplayer/play.c
@@ -104,7 +104,7 @@ void mplEnd( void )
guiIntfStruct.AudioType=0;
guiIntfStruct.NoWindow=False;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
guiIntfStruct.DVD.current_title=1;
guiIntfStruct.DVD.current_chapter=1;
guiIntfStruct.DVD.current_angle=1;
@@ -292,7 +292,7 @@ void mplCurr( void )
if ( guiIntfStruct.Playing == 2 ) return;
switch ( guiIntfStruct.StreamType )
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
break;
#endif
@@ -322,7 +322,7 @@ void mplPrev( void )
if ( guiIntfStruct.Playing == 2 ) return;
switch ( guiIntfStruct.StreamType )
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
if ( --guiIntfStruct.DVD.current_chapter == 0 )
{
@@ -358,7 +358,7 @@ void mplNext( void )
if ( guiIntfStruct.Playing == 2 ) return;
switch ( guiIntfStruct.StreamType )
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
if ( guiIntfStruct.DVD.current_chapter++ == guiIntfStruct.DVD.chapters )
{
diff --git a/gui/win32/dialogs.c b/gui/win32/dialogs.c
index 370ca789cd..b750fb9caf 100644
--- a/gui/win32/dialogs.c
+++ b/gui/win32/dialogs.c
@@ -778,7 +778,7 @@ void display_skinbrowser(gui_t* gui)
UpdateWindow(hWnd);
}
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
static LRESULT CALLBACK TitleChapterWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
{
static HWND title;
diff --git a/gui/win32/gui.c b/gui/win32/gui.c
index 9f55cb4f46..a56a4c77a7 100644
--- a/gui/win32/gui.c
+++ b/gui/win32/gui.c
@@ -407,7 +407,7 @@ static LRESULT CALLBACK SubProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l
case ID_NTRACK:
handlemsg(hWnd, evNext);
break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case ID_CHAPTERSEL:
display_chapterselwindow(gui);
break;
@@ -1005,7 +1005,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
sprintf(searchpath, "%sVIDEO_TS", device + pos);
if(GetFileAttributes(searchpath) != INVALID_FILE_ATTRIBUTES)
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
if (dvd_device) free(dvd_device);
dvd_device = strdup(device + pos);
dvd_title = dvd_chapter = dvd_angle = 1;
@@ -1211,7 +1211,7 @@ static void create_submenu(gui_t *gui)
AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->aspectmenu, "Aspect Ratio");
AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->subtitlemenu, "Subtitle Options");
AppendMenu(gui->submenu, MF_STRING | MF_POPUP, (UINT) gui->dvdmenu, "DVD Options");
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
AppendMenu(gui->dvdmenu, MF_STRING | MF_GRAYED, ID_CHAPTERSEL, "Select Title/Chapter...");
#endif
AppendMenu(gui->subtitlemenu, MF_STRING, IDSUB_TOGGLE, "Subtitle Visibility On/Off");
diff --git a/gui/win32/interface.c b/gui/win32/interface.c
index 2c357a9527..6b3eaafc54 100644
--- a/gui/win32/interface.c
+++ b/gui/win32/interface.c
@@ -32,7 +32,7 @@
#include "stream/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
#include "stream/stream_dvd.h"
#endif
#include "input/input.h"
@@ -151,7 +151,7 @@ static void guiSetEvent(int event)
case evPause:
mplPause();
break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case evPlayDVD:
{
static char dvdname[MAX_PATH];
@@ -273,7 +273,7 @@ static void guiSetEvent(int event)
{
switch(guiIntfStruct.StreamType)
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
{
guiIntfStruct.Title = guiIntfStruct.DVD.current_title;
@@ -337,7 +337,7 @@ void mplNext(void)
if(guiIntfStruct.Playing == 2) return;
switch(guiIntfStruct.StreamType)
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
if(guiIntfStruct.DVD.current_chapter == (guiIntfStruct.DVD.chapters - 1))
return;
@@ -359,7 +359,7 @@ void mplPrev(void)
if(guiIntfStruct.Playing == 2) return;
switch(guiIntfStruct.StreamType)
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
if(guiIntfStruct.DVD.current_chapter == 1)
return;
@@ -405,7 +405,7 @@ void mplEnd( void )
guiIntfStruct.Position = 0;
guiIntfStruct.AudioType = 0;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
guiIntfStruct.DVD.current_title = 1;
guiIntfStruct.DVD.current_chapter = 1;
guiIntfStruct.DVD.current_angle = 1;
@@ -521,7 +521,7 @@ void guiDone(void)
int guiGetEvent(int type, char *arg)
{
stream_t *stream = (stream_t *) arg;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
dvd_priv_t *dvdp = (dvd_priv_t *) arg;
#endif
if(!mygui || !mygui->skin) return 0;
@@ -549,7 +549,7 @@ int guiGetEvent(int type, char *arg)
{
case STREAMTYPE_PLAYLIST:
break;
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
{
char tmp[512];
@@ -614,7 +614,7 @@ int guiGetEvent(int type, char *arg)
guiIntfStruct.StreamType = stream->type;
switch(stream->type)
{
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case STREAMTYPE_DVD:
guiGetEvent(guiSetDVD, (char *) stream->priv);
break;
@@ -622,7 +622,7 @@ int guiGetEvent(int type, char *arg)
}
break;
}
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
case guiSetDVD:
{
guiIntfStruct.DVD.titles = dvdp->vmg_file->tt_srpt->nr_of_srpts;
diff --git a/gui/win32/widgetrender.c b/gui/win32/widgetrender.c
index 71780d8f1b..0ac2e730ea 100644
--- a/gui/win32/widgetrender.c
+++ b/gui/win32/widgetrender.c
@@ -162,7 +162,7 @@ static char *generatetextfromlabel(widget *item)
if(guiIntfStruct.StreamType == 0)
stringreplace(text, "$T", "f");
-#ifdef USE_DVDREAD
+#ifdef CONFIG_DVDREAD
else if(guiIntfStruct.StreamType == STREAMTYPE_DVD || guiIntfStruct.StreamType == STREAMTYPE_DVDNAV)
stringreplace(text, "$T", "d");
#endif