diff options
-rw-r--r-- | Gui/interface.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/gtk/fs.c | 2 | ||||
-rw-r--r-- | Gui/mplayer/pb.c | 16 | ||||
-rw-r--r-- | mplayer.c | 1 |
4 files changed, 16 insertions, 7 deletions
diff --git a/Gui/interface.c b/Gui/interface.c index a1c762955d..45430888ab 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -170,7 +170,6 @@ void guiInit( void ) #ifdef HAVE_DXR3 if ( !gtkDXR3Device ) gtkDXR3Device=strdup( "/dev/em8300-0" ); #endif - fullscreen=gtkLoadFullscreen; if ( stream_cache_size != -1 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; } if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; } @@ -189,7 +188,7 @@ void guiInit( void ) case -2: mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_SKIN_SKINCFG_SkinCfgReadError,skinName ); exit( 0 ); } // --- initialize windows - if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) + if ( ( mplDrawBuffer = (unsigned char *)malloc( appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) { fprintf( stderr,MSGTR_NEMDB ); exit( 0 ); @@ -259,6 +258,7 @@ void guiInit( void ) appMPlayer.subWindow.Mapped=wsMapped; } + if ( !fullscreen ) fullscreen=gtkLoadFullscreen; if ( fullscreen ) { mplFullScreen(); 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; } @@ -1275,6 +1275,7 @@ if(!demuxer) play_tree_t* entry; // Handle playlist current_module="handle_playlist"; + if ( stream->type != STREAMTYPE_PLAYLIST ) goto goto_next_file; mp_msg(MSGT_CPLAYER,MSGL_INFO,"Falling back on trying to parse playlist %s...\n",filename); stream_reset(stream); stream_seek(stream,stream->start_pos); |