[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk eq.c,1.8,1.9 fs.c,1.23,1.24 opts.c,1.8,1.9

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv17005/Gui/mplayer/gtk

Modified Files:
	eq.c fs.c opts.c 
Log Message:


- fix equ handling
- fix dvd pos bar
- fix 10l bug in evLoadPlay bugfix :)
- mittomen


Index: eq.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/eq.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eq.c	4 Aug 2002 19:23:58 -0000	1.8
+++ eq.c	5 Aug 2002 01:14:14 -0000	1.9
@@ -116,7 +116,7 @@
  VHueadj->value=(float)vo_gamma_hue;
  VSaturationadj->value=(float)vo_gamma_saturation;
 
- if ( !guiIntfStruct.Playing || !gtkEnableVideoEqualizer )
+ if ( !guiIntfStruct.Playing )
   {
    gtk_widget_set_sensitive( VContrast,FALSE );
    gtk_widget_set_sensitive( VBrightness,FALSE );
@@ -210,7 +210,7 @@
 	 }
 	 else
 	  {
-	   if ( !guiIntfStruct.Playing || !gtkEnableVideoEqualizer ) break;
+	   if ( !guiIntfStruct.Playing ) break;
 	   gtkSet( gtkSetContrast,0.0f,NULL );
 	   gtkSet( gtkSetBrightness,0.0f,NULL );
 	   gtkSet( gtkSetHue,0.0f,NULL );

Index: fs.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- fs.c	4 Aug 2002 19:23:58 -0000	1.23
+++ fs.c	5 Aug 2002 01:14:14 -0000	1.24
@@ -455,7 +455,7 @@
    item=item->next;
   }
  if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name() );
- if ( mplMainAutoPlay ) mplEventHandling( evPlay,0 );
+ if ( mplMainAutoPlay ) { mplMainAutoPlay=0; mplEventHandling( evPlay,0 ); }
 }
 
 void fs_Cancel_released( GtkButton * button,gpointer user_data )

Index: opts.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- opts.c	4 Aug 2002 19:23:58 -0000	1.8
+++ opts.c	5 Aug 2002 01:14:14 -0000	1.9
@@ -35,7 +35,6 @@
 
 static GtkWidget * CBVFM;
 static GtkWidget * CBAudioEqualizer;
-static GtkWidget * CBVideoEqualizer;
 //static GtkWidget * CBSurround;
 static GtkWidget * CBExtraStereo;
 static GtkWidget * CBNoSound;
@@ -122,7 +121,7 @@
    {
     const ao_info_t *info = audio_out_drivers[i++]->info;
     if ( !strcmp( info->short_name,"plugin" ) ) continue;
-    if ( !strcmp( gtkAODriver,info->short_name ) ) old_audio_driver=i - 1;
+    if ( !gstrcmp( gtkAODriver,info->short_name ) ) old_audio_driver=i - 1;
     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 );
@@ -132,7 +131,6 @@
  }
 
 // -- 2. page
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBVideoEqualizer ),gtkEnableVideoEqualizer );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ),gtkVODoubleBuffer );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDR ),gtkVODirectRendering );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBFramedrop ),gtkVFrameDrop );
@@ -282,7 +280,6 @@
 	gtkVODriver=gstrdup( vo_driver[0] );
 
 	// -- 2. page
-	gtkEnableVideoEqualizer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBVideoEqualizer ) );
 	gtkVODoubleBuffer=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDoubleBuffer ) );
 	gtkVODirectRendering=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDR ) );
 	gtkVFrameDrop=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFramedrop ) );
@@ -821,13 +818,6 @@
   gtk_widget_show( vbox5 );
   gtk_container_add( GTK_CONTAINER( frame ),vbox5 );
   gtk_widget_set_usize( vbox5,250,-2 );
-
-  CBVideoEqualizer=gtk_check_button_new_with_label( MSGTR_PREFERENCES_VideoEqu );
-  gtk_widget_set_name( CBVideoEqualizer,"CBVideoEqualizer" );
-  gtk_widget_ref( CBVideoEqualizer );
-  gtk_object_set_data_full( GTK_OBJECT( Preferences ),"CBVideoEqualizer",CBVideoEqualizer,(GtkDestroyNotify)gtk_widget_unref );
-  gtk_widget_show( CBVideoEqualizer );
-  gtk_box_pack_start( GTK_BOX( vbox5 ),CBVideoEqualizer,FALSE,FALSE,0 );
 
   CBDoubleBuffer=gtk_check_button_new_with_label( MSGTR_PREFERENCES_DoubleBuffer );
   gtk_widget_set_name( CBDoubleBuffer,"CBDoubleBuffer" );