summaryrefslogtreecommitdiffstats
path: root/Gui/interface.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-01-25 10:04:05 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-01-25 10:04:05 +0000
commit42d3010880f8df5965b715bb31a471357b4ac2b6 (patch)
tree772e8c7455ba104053ca42efb316bfe819b28932 /Gui/interface.c
parent8e2ccdff36356c7705f20b142f0776f69639c0ea (diff)
downloadmpv-42d3010880f8df5965b715bb31a471357b4ac2b6.tar.bz2
mpv-42d3010880f8df5965b715bb31a471357b4ac2b6.tar.xz
- fix -fs
- set sub_fps to null for new files - fix one sig11, if you play vcd, and the disc is not vcd, playtree is dead - add playbar vertical position support - etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9089 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/interface.c')
-rw-r--r--Gui/interface.c4
1 files changed, 2 insertions, 2 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();