summaryrefslogtreecommitdiffstats
path: root/Gui
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-13 14:12:21 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-11-13 14:12:21 +0000
commitb17a5ada7860b35641524d07c6e53e0feb796046 (patch)
treec72f30c15bbc43f4a717536197d49ed99a80c997 /Gui
parentf2de70140d971c3af556d7d96c340375d7c1d4d7 (diff)
downloadmpv-b17a5ada7860b35641524d07c6e53e0feb796046.tar.bz2
mpv-b17a5ada7860b35641524d07c6e53e0feb796046.tar.xz
10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8182 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/Makefile2
-rw-r--r--Gui/mplayer/gtk/opts.c13
2 files changed, 9 insertions, 6 deletions
diff --git a/Gui/Makefile b/Gui/Makefile
index 2115c30f2e..f9fa4b5483 100644
--- a/Gui/Makefile
+++ b/Gui/Makefile
@@ -17,7 +17,7 @@ CFLAGS = $(OPTIMIZE) $(INCDIR) $(DEBUG)
SRCS = wm/ws.c wm/wsxdnd.c app.c interface.c cfg.c bitmap.c \
skin/skin.c skin/font.c skin/cut.c \
mplayer/widgets.c mplayer/play.c mplayer/mw.c mplayer/sw.c mplayer/menu.c \
- mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c
+ mplayer/gtk/menu.c mplayer/gtk/mb.c mplayer/gtk/about.c mplayer/gtk/pl.c mplayer/gtk/sb.c mplayer/gtk/fs.c mplayer/gtk/opts.c mplayer/gtk/url.c mplayer/gtk/eq.c mplayer/gtk/common.c
OBJS = $(SRCS:.c=.o)
.SUFFIXES: .c .o
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index 1df2a296e5..ac2ef4da16 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -169,7 +169,7 @@ void ShowPreferences( void )
{
int i = 0;
char * tmp[3]; tmp[2]="";
- old_audio_driver=0;
+ old_audio_driver=-1;
while ( audio_out_drivers[i] )
{
const ao_info_t *info = audio_out_drivers[i++]->info;
@@ -183,12 +183,15 @@ void ShowPreferences( void )
}
tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp );
}
- gtk_clist_select_row( GTK_CLIST( CLADrivers ),old_audio_driver,0 );
- gtk_clist_get_text( GTK_CLIST( CLADrivers ),old_audio_driver,0,(char **)&ao_driver );
- gtk_widget_set_sensitive( AConfig,FALSE );
+ if ( old_audio_driver > -1 )
+ {
+ gtk_clist_select_row( GTK_CLIST( CLADrivers ),old_audio_driver,0 );
+ gtk_clist_get_text( GTK_CLIST( CLADrivers ),old_audio_driver,0,(char **)&ao_driver );
+ gtk_widget_set_sensitive( AConfig,FALSE );
#ifdef USE_OSS_AUDIO
- if ( !strncmp( ao_driver[0],"oss",3 ) ) gtk_widget_set_sensitive( AConfig,TRUE );
+ if ( !strncmp( ao_driver[0],"oss",3 ) ) gtk_widget_set_sensitive( AConfig,TRUE );
#endif
+ }
}
// -- 2. page