[MPlayer-cvslog] r32828 - in trunk/gui: mplayer/gtk/about.c mplayer/gtk/opts.c mplayer/widgets.c wm/ws.c

[ib]

Author: ib
Date: Sat Jan 29 17:39:52 2011
New Revision: 32828

Log:
Cast properly (to avoid compiler warnings).

Modified:
   trunk/gui/mplayer/gtk/about.c
   trunk/gui/mplayer/gtk/opts.c
   trunk/gui/mplayer/widgets.c
   trunk/gui/wm/ws.c

Modified: trunk/gui/mplayer/gtk/about.c
==============================================================================
--- trunk/gui/mplayer/gtk/about.c	Sat Jan 29 16:13:55 2011	(r32827)
+++ trunk/gui/mplayer/gtk/about.c	Sat Jan 29 17:39:52 2011	(r32828)
@@ -73,7 +73,7 @@ GtkWidget * create_About( void )
   vbox=AddVBox( AddDialogFrame( About ),0 );
 
   pixmapstyle=gtk_widget_get_style( About );
-  pixmapwid=gdk_pixmap_colormap_create_from_xpm_d( About->window,gdk_colormap_get_system(),&mask,&pixmapstyle->bg[GTK_STATE_NORMAL],about_xpm );
+  pixmapwid=gdk_pixmap_colormap_create_from_xpm_d( About->window,gdk_colormap_get_system(),&mask,&pixmapstyle->bg[GTK_STATE_NORMAL],(gchar **) about_xpm );
   pixmap1=gtk_pixmap_new( pixmapwid,mask );
 
   gtk_widget_set_name( pixmap1,"pixmap1" );

Modified: trunk/gui/mplayer/gtk/opts.c
==============================================================================
--- trunk/gui/mplayer/gtk/opts.c	Sat Jan 29 16:13:55 2011	(r32827)
+++ trunk/gui/mplayer/gtk/opts.c	Sat Jan 29 17:39:52 2011	(r32828)
@@ -1557,33 +1557,33 @@ static void audioButton(GtkButton *butto
     case 1:
 #ifdef CONFIG_OSS_AUDIO
       if (strncmp(ao_driver[0], "oss", 3) == 0) {
-        gfree(&gtkAOOSSDevice);
+        gfree((void **) &gtkAOOSSDevice);
         gtkAOOSSDevice = gstrdup(getGtkEntryText(CEAudioDevice));
-        gfree(&gtkAOOSSMixer);
+        gfree((void **) &gtkAOOSSMixer);
         gtkAOOSSMixer = gstrdup(getGtkEntryText(CEAudioMixer));
-        gfree(&gtkAOOSSMixerChannel);
+        gfree((void **) &gtkAOOSSMixerChannel);
         gtkAOOSSMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
 #ifdef CONFIG_ALSA
       if (strncmp(ao_driver[0], "alsa", 4) == 0) {
-        gfree(&gtkAOALSADevice);
+        gfree((void **) &gtkAOALSADevice);
         gtkAOALSADevice = gstrdup(getGtkEntryText(CEAudioDevice));
-        gfree(&gtkAOALSAMixer);
+        gfree((void **) &gtkAOALSAMixer);
         gtkAOALSAMixer = gstrdup(getGtkEntryText(CEAudioMixer));
-        gfree(&gtkAOALSAMixerChannel);
+        gfree((void **) &gtkAOALSAMixerChannel);
         gtkAOALSAMixerChannel = gstrdup(getGtkEntryText(CEAudioMixerChannel));
       }
 #endif
 #ifdef CONFIG_SDL
       if (strncmp(ao_driver[0], "sdl", 3) == 0) {
-        gfree(&gtkAOSDLDriver);
+        gfree((void **) &gtkAOSDLDriver);
         gtkAOSDLDriver = gstrdup(getGtkEntryText(CEAudioDevice));
       }
 #endif
 #ifdef CONFIG_ESD
       if (strncmp(ao_driver[0], "esd", 3) == 0) {
-        gfree(&gtkAOESDDevice);
+        gfree((void **) &gtkAOESDDevice);
         gtkAOESDDevice = gstrdup(getGtkEntryText(CEAudioDevice));
       }
 #endif

Modified: trunk/gui/mplayer/widgets.c
==============================================================================
--- trunk/gui/mplayer/widgets.c	Sat Jan 29 16:13:55 2011	(r32827)
+++ trunk/gui/mplayer/widgets.c	Sat Jan 29 17:39:52 2011	(r32828)
@@ -86,7 +86,7 @@ void gtkInit( void )
   win=gtk_window_new( GTK_WINDOW_TOPLEVEL );
 
   if ( !gtkIcon )
-    gtkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gtkIconMask,&win->style->bg[GTK_STATE_NORMAL],MPlayer_mini_xpm );
+    gtkIcon=gdk_pixmap_colormap_create_from_xpm_d( win->window,gdk_colormap_get_system(),&gtkIconMask,&win->style->bg[GTK_STATE_NORMAL],(gchar **) MPlayer_mini_xpm );
 
   guiIcon=GDK_WINDOW_XWINDOW( gtkIcon );
   guiIconMask=GDK_WINDOW_XWINDOW( gtkIconMask );

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Sat Jan 29 16:13:55 2011	(r32827)
+++ trunk/gui/wm/ws.c	Sat Jan 29 17:39:52 2011	(r32828)
@@ -839,7 +839,7 @@ void wsConvert( wsTWindow * win,unsigned
   switch (win->xImage->bits_per_pixel) {
     case 32:
     {
-      uint32_t *d = win->ImageData;
+      uint32_t *d = (uint32_t *) win->ImageData;
       for (i = 0; i < win->xImage->width * win->xImage->height; i++)
         d[i] = bswap_32(d[i]);
       break;
@@ -847,7 +847,7 @@ void wsConvert( wsTWindow * win,unsigned
     case 16:
     case 15:
     {
-      uint16_t *d = win->ImageData;
+      uint16_t *d = (uint16_t *) win->ImageData;
       for (i = 0; i < win->xImage->width * win->xImage->height; i++)
         d[i] = bswap_16(d[i]);
       break;