[Mplayer-cvslog] CVS: main/Gui app.c,1.6,1.7 events.c,1.1,1.2 events.h,1.2,1.3

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui
In directory mplayer:/var/tmp.root/cvs-serv4305/Gui

Modified Files:
	app.c events.c events.h 
Log Message:
fix some bug.

Index: app.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/app.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- app.c	28 Aug 2001 15:53:40 -0000	1.6
+++ app.c	1 Sep 2001 17:53:01 -0000	1.7
@@ -72,8 +72,9 @@
 
  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 @@
  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
 }

Index: events.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/events.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- events.c	25 Aug 2001 21:04:26 -0000	1.1
+++ events.c	1 Sep 2001 17:53:01 -0000	1.2
@@ -40,7 +40,8 @@
   { evDoubleSize,        "evDoubleSize"        }, // 38
   { evSetMoviePosition,  "evSetMoviePosition"  }, // 39
   { evSetVolume,         "evSetVolume"         }, // 40
-  { evSetBalance,        "evSetBalance"        }  // 41
+  { evSetBalance,        "evSetBalance"        }, // 41
+  { evHelp,		 "evHelp"	       }	
  };
 
 const int evBoxs = sizeof( evNames ) / sizeof( evName );

Index: events.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/events.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- events.h	29 Aug 2001 15:07:40 -0000	1.2
+++ events.h	1 Sep 2001 17:53:01 -0000	1.3
@@ -41,6 +41,8 @@
 #define evSetVolume         36
 #define evSetBalance        37
 
+#define evHelp              38
+
 #define evExit              1000
 
 // --- General events ---