[Mplayer-cvslog] CVS: main/Gui/mplayer mw.h,1.72,1.73 play.c,1.69,1.70 widgets.c,1.36,1.37 widgets.h,1.17,1.18

[Zoltan Ponekker]

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

Modified Files:
	mw.h play.c widgets.c widgets.h 
Log Message:


- fix mixer handling
- some change in menu
- fix evLoadPlay bug
- etc


Index: mw.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/mw.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mw.h	25 Jul 2002 20:26:34 -0000	1.72
+++ mw.h	4 Aug 2002 19:23:57 -0000	1.73
@@ -263,7 +263,6 @@
    case evPlaySwitchToPause:
 play:
 
-        mplMainAutoPlay=0;
         if ( ( msg == evPlaySwitchToPause )&&( guiIntfStruct.Playing == 2 ) ) goto NoPause;
 
 	vcd_track=0;

Index: play.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/play.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- play.c	31 Jul 2002 13:26:46 -0000	1.69
+++ play.c	4 Aug 2002 19:23:57 -0000	1.70
@@ -102,6 +102,8 @@
   } 
   else
     {
+     if ( mplMainAutoPlay ) { mplMainAutoPlay=0; return; }
+
      guiIntfStruct.TimeSec=0;
      guiIntfStruct.Position=0;
      guiIntfStruct.AudioType=0;

Index: widgets.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- widgets.c	4 Aug 2002 17:23:59 -0000	1.36
+++ widgets.c	4 Aug 2002 19:23:57 -0000	1.37
@@ -38,7 +38,6 @@
 int gtkPopupMenu = 0;
 int gtkPopupMenuParam = 0;
 int gtkInited = 0;
-int gtkVisible = 0;
 
 #include "gtk/sb.h"
 #include "gtk/pl.h"
@@ -117,8 +116,7 @@
 void gtkEventHandling( void )
 {
  int i;
- if ( gtkVisible > 0 )
-   for( i=0;i < 25;i++ ) gtk_main_iteration_do( 0 );
+ for( i=0;i < 25;i++ ) gtk_main_iteration_do( 0 );
 }
 
 // --- funcs
@@ -185,7 +183,7 @@
          } 
 	 else 
 	  {
-	   gtk_widget_destroy( SkinBrowser ); gtkDecVisible();
+	   gtk_widget_destroy( SkinBrowser );
 	   gtkMessageBox( GTK_MB_ERROR,"Skin dirs not found ... Please install skins." );
 	  }
         break;
@@ -219,13 +217,12 @@
    case evShowPopUpMenu:
         gtkPopupMenu=evNone;
         gtkPopupMenuParam=0;
-        if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); gtkDecVisible(); }
+        if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); }
         PopUpMenu=create_PopUpMenu();
         gtk_menu_popup( GTK_MENU( PopUpMenu ),NULL,NULL,NULL,NULL,0,0 );
-	gtkIncVisible();
         break;
    case evHidePopUpMenu:
-        if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); /*gtkVisible--;*/ PopUpMenu=NULL; }
+        if ( PopUpMenu ) { gtk_widget_hide_on_delete( PopUpMenu ); PopUpMenu=NULL; }
         break;
    case evPlayNetwork:
 	ShowURLDialogBox();
@@ -233,7 +230,3 @@
 	break;
   }
 }
-
-void gtkIncVisible( void ) { gtkVisible++; }
-void gtkDecVisible( void ) { if ( gtkVisible > 0 ) gtkVisible--; }
-

Index: widgets.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/widgets.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- widgets.h	30 Jul 2002 23:09:23 -0000	1.17
+++ widgets.h	4 Aug 2002 19:23:57 -0000	1.18
@@ -41,8 +41,6 @@
 extern Pixmap      guiIcon;
 extern Pixmap	   guiIconMask;
 
-extern int gtkVisible;
-
 extern void widgetsCreate( void );
 
 extern void gtkInit( void );
@@ -60,8 +58,5 @@
 extern void gtkMessageBox( int type,gchar * str );
 extern void gtkSetLayer( GtkWidget * wdg );
 extern void gtkActive( GtkWidget * wdg );
-
-extern void gtkIncVisible( void );
-extern void gtkDecVisible( void );
 
 #endif