diff options
Diffstat (limited to 'Gui/mplayer')
| -rw-r--r-- | Gui/mplayer/gtk/fs.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/pb.c | 16 |
2 files changed, 13 insertions, 5 deletions
diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index 98d9c219cb..427445c0a6 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -471,7 +471,7 @@ void fs_Ok_released( GtkButton * button,gpointer user_data ) case fsVideoSelector: guiSetDF( guiIntfStruct.Filename,fsSelectedDirectory,fsSelectedFile ); guiIntfStruct.StreamType=STREAMTYPE_FILE; - guiIntfStruct.FilenameChanged=1; + guiIntfStruct.FilenameChanged=1; sub_fps=0; gfree( (void **)&guiIntfStruct.AudioFile ); gfree( (void **)&guiIntfStruct.Subtitlename ); fs_PersistantHistory( fsSelectedDirectory ); //totem, write into history diff --git a/Gui/mplayer/pb.c b/Gui/mplayer/pb.c index 720727e046..e87a82f7b3 100644 --- a/Gui/mplayer/pb.c +++ b/Gui/mplayer/pb.c @@ -39,11 +39,19 @@ int mplPBFade = 0; void mplPBDraw( void ) { + int x; + if ( !appMPlayer.subWindow.isFullScreen ) return; if ( !mplPBVisible || !appMPlayer.barIsPresent ) return; - appMPlayer.bar.x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ) / 2; - +// appMPlayer.bar.x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ) / 2; + switch( appMPlayer.bar.x ) + { + case -1: x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ) / 2; break; + case -2: x=( appMPlayer.subWindow.Width - appMPlayer.bar.width ); break; + default: x=appMPlayer.bar.x; + } + switch ( mplPBFade ) { case 1: // fade in @@ -54,7 +62,7 @@ void mplPBDraw( void ) mplPBFade=0; vo_mouse_autohide=0; } - wsMoveWindow( &appMPlayer.barWindow,0,appMPlayer.bar.x,mplPBLength ); + wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); break; case 2: // fade out mplPBLength+=10; @@ -66,7 +74,7 @@ void mplPBDraw( void ) wsVisibleWindow( &appMPlayer.barWindow,wsHideWindow ); return; } - wsMoveWindow( &appMPlayer.barWindow,0,appMPlayer.bar.x,mplPBLength ); + wsMoveWindow( &appMPlayer.barWindow,0,x,mplPBLength ); break; } |