aboutsummaryrefslogtreecommitdiffhomepage
path: root/Gui
diff options
context:
space:
mode:
authorGravatar pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-03 19:02:45 +0000
committerGravatar pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-02-03 19:02:45 +0000
commit69de035e80e1dee6c5328850375826d36cb2886c (patch)
treef76153bcd7adea870b7ecbeb929a4c827fcae95b /Gui
parentba784a31bb49bf369a348b3a1bdcd2e4c9e97642 (diff)
'video window vanishes after pause' bugfix, based on André Kühne's (andre.kuehne@gmx.net) bugreport
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11919 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
-rw-r--r--Gui/interface.c2
-rw-r--r--Gui/mplayer/gtk/opts.c7
-rw-r--r--Gui/skin/skin.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/Gui/interface.c b/Gui/interface.c
index eeaf75d544..801176f812 100644
--- a/Gui/interface.c
+++ b/Gui/interface.c
@@ -516,7 +516,7 @@ int guiGetEvent( int type,char * arg )
{
case guiSetPlay:
guiIntfStruct.Playing=1;
- if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
+// if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
break;
case guiSetStop:
guiIntfStruct.Playing=0;
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index c3c544218e..0e5ee5dce4 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -688,6 +688,7 @@ static gboolean prHScaler( GtkWidget * widget,GdkEventMotion * event,gpointer u
static void prToggled( GtkToggleButton * togglebutton,gpointer user_data )
{
+ int window;
switch ( (int)user_data )
{
case 0: // extra stereo coefficient
@@ -707,9 +708,11 @@ static void prToggled( GtkToggleButton * togglebutton,gpointer user_data )
}
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:
diff --git a/Gui/skin/skin.h b/Gui/skin/skin.h
index d71e90f610..9cf8a5471a 100644
--- a/Gui/skin/skin.h
+++ b/Gui/skin/skin.h
@@ -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 );