Mercurial > mplayer.hg

changeset 8181:6892658f9125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l
author pontscho
date Wed, 13 Nov 2002 14:12:21 +0000
parents 4ba9aed295f2
children ee87db98f4eb
files Gui/Makefile Gui/mplayer/gtk/opts.c
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/Makefile	Wed Nov 13 09:09:50 2002 +0000
+++ b/Gui/Makefile	Wed Nov 13 14:12:21 2002 +0000
@@ -17,7 +17,7 @@
 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
--- a/Gui/mplayer/gtk/opts.c	Wed Nov 13 09:09:50 2002 +0000
+++ b/Gui/mplayer/gtk/opts.c	Wed Nov 13 14:12:21 2002 +0000
@@ -169,7 +169,7 @@
  {
   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 @@
      }
     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