changeset 11918:634a2b279b1a

'video window vanishes after pause' bugfix, based on Andr¸«± K¸«ähne's (andre.kuehne@gmx.net) bugreport
author pontscho
date Tue, 03 Feb 2004 19:02:45 +0000
parents f17039c05701
children f7c2ea48a935
files Gui/interface.c Gui/mplayer/gtk/opts.c Gui/skin/skin.h
diffstat 3 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Gui/interface.c	Tue Feb 03 15:43:17 2004 +0000
+++ b/Gui/interface.c	Tue Feb 03 19:02:45 2004 +0000
@@ -516,7 +516,7 @@
 	 {
 	  case guiSetPlay: 
 	       guiIntfStruct.Playing=1;
-	       if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
+//	       if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
 	       break;
 	  case guiSetStop:
 	       guiIntfStruct.Playing=0;
--- a/Gui/mplayer/gtk/opts.c	Tue Feb 03 15:43:17 2004 +0000
+++ b/Gui/mplayer/gtk/opts.c	Tue Feb 03 19:02:45 2004 +0000
@@ -688,6 +688,7 @@
 
 static void prToggled( GtkToggleButton * togglebutton,gpointer user_data )
 {
+ int window;
  switch ( (int)user_data )
   {
    case 0: // extra stereo coefficient
@@ -707,9 +708,11 @@
 	  }
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) )
 	 {
-	  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
+	  window=wsShowWindow;
 	  gtkActive( Preferences );
-	 } else wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
+	 } else window=wsHideWindow;
+
+	if ( !guiIntfStruct.Playing ) wsVisibleWindow( &appMPlayer.subWindow,window );
 	break;
    case 4:
    case 5:
--- a/Gui/skin/skin.h	Tue Feb 03 15:43:17 2004 +0000
+++ b/Gui/skin/skin.h	Tue Feb 03 19:02:45 2004 +0000
@@ -5,8 +5,6 @@
 #include "../app.h"
 
 extern listItems     * skinAppMPlayer;
-//extern listItems     * skinAppTV;
-//extern listItems     * skinAppRadio;
 
 extern int skinRead( char * dname  );
 extern int skinBPRead( char * fname, txSample * bf );