applied 64bit patch from Ulrich Hecht <uli@suse.de>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6160 b3059339-0415-0410-9bf9-f77b7e298cf2

7 files changed, 23 insertions, 22 deletions

diff --git a/Gui/bitmap.c b/Gui/bitmap.c
index 8e9c06a0c5..24c8e73006 100644
--- a/Gui/bitmap.c
+++ b/Gui/bitmap.c
@@ -207,7 +207,7 @@ void Convert1to32( txSample * in,txSample * out )
  out->ImageSize=out->Width * out->Height * 4;
  out->Image=(char *)calloc( 1,out->ImageSize );
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c32to1] imagesize: %d\n",out->ImageSize );
- if ( (int)out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"nem van ram baze\n" );
+ if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"nem van ram baze\n" );
  {
   int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0;
   buf=(unsigned int *)out->Image;
diff --git a/Gui/bitmap/bitmap.c b/Gui/bitmap/bitmap.c
index 8e9c06a0c5..24c8e73006 100644
--- a/Gui/bitmap/bitmap.c
+++ b/Gui/bitmap/bitmap.c
@@ -207,7 +207,7 @@ void Convert1to32( txSample * in,txSample * out )
  out->ImageSize=out->Width * out->Height * 4;
  out->Image=(char *)calloc( 1,out->ImageSize );
  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[c32to1] imagesize: %d\n",out->ImageSize );
- if ( (int)out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"nem van ram baze\n" );
+ if ( out->Image == NULL ) mp_msg( MSGT_GPLAYER,MSGL_STATUS,"nem van ram baze\n" );
  {
   int i,b,c=0; unsigned int * buf = NULL; unsigned char tmp = 0;
   buf=(unsigned int *)out->Image;
diff --git a/Gui/mplayer/gtk/mb.c b/Gui/mplayer/gtk/mb.c
index 4594ea6d6b..ae53f112cf 100644
--- a/Gui/mplayer/gtk/mb.c
+++ b/Gui/mplayer/gtk/mb.c
@@ -41,7 +41,7 @@ GtkWidget * create_MessageBox( int type )
  GtkWidget * Ok;
  GtkAccelGroup * accel_group;
  GtkStyle * pixmapstyle;
- GtkPixmap * pixmapwid;
+ GdkPixmap * pixmapwid;
  GdkBitmap * mask;
 
  accel_group=gtk_accel_group_new();
diff --git a/Gui/mplayer/menu.h b/Gui/mplayer/menu.h
index edeff7f9e3..3e67e9c32f 100644
--- a/Gui/mplayer/menu.h
+++ b/Gui/mplayer/menu.h
@@ -9,8 +9,8 @@ void mplHideMenu( int mx,int my,int w );
 
 void mplMenuDraw( wsParamDisplay )
 {
- unsigned int * buf = NULL;
- unsigned int * drw = NULL;
+ uint32_t * buf = NULL;
+ uint32_t * drw = NULL;
  int             x,y,tmp;
 
  if ( !appMPlayer.menuBase.Bitmap.Image ) return;
@@ -22,8 +22,8 @@ void mplMenuDraw( wsParamDisplay )
 // ---
    if ( mplMenuItem != -1 )
     {
-     buf=(unsigned int *)mplMenuDrawBuffer;
-     drw=(unsigned int *)appMPlayer.menuSelected.Bitmap.Image;
+     buf=(uint32_t *)mplMenuDrawBuffer;
+     drw=(uint32_t *)appMPlayer.menuSelected.Bitmap.Image;
      for ( y=appMPlayer.MenuItems[ mplMenuItem ].y; y < appMPlayer.MenuItems[ mplMenuItem ].y + appMPlayer.MenuItems[ mplMenuItem ].height; y++ )
        for ( x=appMPlayer.MenuItems[ mplMenuItem ].x; x < appMPlayer.MenuItems[ mplMenuItem ].x + appMPlayer.MenuItems[ mplMenuItem ].width; x++ )
          {
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h
index f9541e3bbb..4c03eda50c 100644
--- a/Gui/mplayer/mw.h
+++ b/Gui/mplayer/mw.h
@@ -122,15 +122,15 @@ calclengthmmmmss:
 inline void PutImage( txSample * bf,int x,int y,int max,int ofs )
 {
  int i=0,ix,iy;
- unsigned int * buf = NULL;
- unsigned int * drw = NULL;
- unsigned int   tmp;
+ uint32_t * buf = NULL;
+ uint32_t * drw = NULL;
+ uint32_t   tmp;
 
  if ( ( !bf )||( bf->Image == NULL ) ) return;
 
  i=( bf->Width * ( bf->Height / max ) ) * ofs;
- buf=(unsigned int *)mplDrawBuffer;
- drw=(unsigned int *)bf->Image;
+ buf=(uint32_t *)mplDrawBuffer;
+ drw=(uint32_t *)bf->Image;
 
  for ( iy=y;iy < (int)(y+bf->Height / max);iy++ )
   for ( ix=x;ix < (int)(x+bf->Width);ix++ )
diff --git a/Gui/skin/font.c b/Gui/skin/font.c
index bace086e4a..7c1e70ba1f 100644
--- a/Gui/skin/font.c
+++ b/Gui/skin/font.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
+#include <stdint.h>
 
 #include "skin.h"
 #include "font.h"
@@ -124,8 +125,8 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... )
  txSample 	 tmp2;
  char            p[512];
  va_list         ap;
- unsigned int * ibuf;
- unsigned int * obuf;
+ uint32_t * ibuf;
+ uint32_t * obuf;
  int             i,x,y;
  int             oy = 0, ox = 0, dx = 0;
 
@@ -144,8 +145,8 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... )
  tmp->ImageSize=tmp->Width * tmp->Height * 4;
  if ( ( tmp->Image=malloc( tmp->ImageSize ) ) ==  NULL ) return NULL;
 
- obuf=(unsigned int *)tmp->Image;
- ibuf=(unsigned int *)Fonts[id]->Bitmap.Image;
+ obuf=(uint32_t *)tmp->Image;
+ ibuf=(uint32_t *)Fonts[id]->Bitmap.Image;
  for ( i=0;i < (int)strlen( p );i++ )
   {
    char c = p[i];
@@ -163,8 +164,8 @@ txSample * fntRender( int id,int px,int sx,char * fmt,... )
    tmp2.ImageSize=sx * tmp->Height * 4;
    if ( ( tmp2.Image=malloc( tmp2.ImageSize ) ) ==  NULL ) { free( tmp->Image ); return NULL; }
 
-   obuf=(unsigned int *)tmp->Image;
-   ibuf=(unsigned int *)tmp2.Image;
+   obuf=(uint32_t *)tmp->Image;
+   ibuf=(uint32_t *)tmp2.Image;
    oy=0;
 
    for ( y=0;y < tmp->Height;y++ )
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index a8c249c6a5..abda544939 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -158,7 +158,7 @@ int wsWindowManagerType( void )
 // --- gnome
 /*
  type=XInternAtom( wsDisplay,"_WIN_SUPPORTING_WM_CHECK",False );
- if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
+ if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
   {
    mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[ws] Detected wm is Gnome\n" );
    XFree( args );
@@ -167,7 +167,7 @@ int wsWindowManagerType( void )
 */
 // --- net wm
  type=XInternAtom( wsDisplay,"_NET_SUPPORTED",False );
- if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
+ if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
   {
    mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[ws] Detected wm is NetWM\n" );
    XFree( args );
@@ -761,7 +761,7 @@ void wsSetLayer( Display * wsDisplay, Window win, int layer )
  }
 					
  type=XInternAtom( wsDisplay,"_NET_SUPPORTED",False );
- if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
+ if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
   {
    XEvent e;
    e.xclient.type=ClientMessage;
@@ -780,7 +780,7 @@ void wsSetLayer( Display * wsDisplay, Window win, int layer )
    return;
   }
  type=XInternAtom( wsDisplay,"_WIN_SUPPORTING_WM_CHECK",False );
- if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
+ if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
   {
    XClientMessageEvent  xev;