From 8d3a4273784f383298d0f43d673eb8d97986379c Mon Sep 17 00:00:00 2001 From: pontscho Date: Sat, 1 Sep 2001 17:53:07 +0000 Subject: fix some bug. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1824 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/app.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'Gui/app.c') diff --git a/Gui/app.c b/Gui/app.c index 4c7ace937d..771e861e29 100644 --- a/Gui/app.c +++ b/Gui/app.c @@ -72,8 +72,9 @@ void appInitStruct( listItems * item ) appClearItem( &item->main ); appClearItem( &item->sub ); - item->sub.Bitmap.Width=256; item->sub.Bitmap.Height=256; - item->sub.width=256; item->sub.height=256; + item->sub.Bitmap.Width=384; item->sub.Bitmap.Height=384; + item->sub.width=384; item->sub.height=384; + item->sub.x=-1; item->sub.y=-1; appClearItem( &item->menuBase ); appClearItem( &item->menuSelected ); item->subR=0; @@ -104,27 +105,14 @@ void appInit( int argc,char* argv[], char *envp[], void* disp ) printf("SKIN dir 1: '%s'\n",skinDirInHome); printf("SKIN dir 2: '%s'\n",skinMPlayerDir); -// if ( ( appMPlayerDirInHome=(char *)calloc( 1,strlen( getenv( "HOME" ) ) + 9 ) ) != NULL ) -// { strcpy( appMPlayerDirInHome,getenv( "HOME" ) ); strcat( appMPlayerDirInHome,"/.mplayer" ); } -// if ( ( skinDirInHome=(char *)calloc( 1,strlen( appMPlayerDirInHome ) + 5 ) ) != NULL ) -// { strcpy( skinDirInHome,appMPlayerDirInHome ); strcat( skinDirInHome,"/Skin" ); } -// if ( ( appMPlayerDir=(char *)calloc( 1,strlen( PREFIX ) + 14 ) ) != NULL ) -// { strcpy( appMPlayerDir,PREFIX ); strcat( appMPlayerDir,"/share/mplayer" ); } -// if ( ( skinMPlayerDir=(char *)calloc( 1,strlen( appMPlayerDir ) + 5 ) ) != NULL ) -// { strcpy( skinMPlayerDir,appMPlayerDir ); strcat( skinMPlayerDir,"/Skin" ); } - initDebug(NULL); // write messages to stderr cfgDefaults(); // set skin to "default" cfgRead(); // empty function - NOP -// if ( !strcmp( cfgAppName,"movieplayer" ) ) -// { - appMPlayer.sub.x=-1; appMPlayer.sub.y=-1; appMPlayer.sub.width=512; appMPlayer.sub.height=256; - switch ( skinRead( cfgSkin ) ) - { - case -1: dbprintf( 0,"[app] skin configfile not found.\n" ); exit( 0 ); - case -2: dbprintf( 0,"[app] skin configfile read error.\n" ); exit( 0 ); - } - mplInit( argc,argv,envp,disp ); // does gtk & ws initialization, create windows -// } + switch ( skinRead( cfgSkin ) ) + { + case -1: dbprintf( 0,"[app] skin configfile not found.\n" ); exit( 0 ); + case -2: dbprintf( 0,"[app] skin configfile read error.\n" ); exit( 0 ); + } + mplInit( argc,argv,envp,disp ); // does gtk & ws initialization, create windows } -- cgit v1.2.3