# HG changeset patch
# User nenolod
# Date 1166463822 28800
# Node ID 48c8ecbfb28264482112a5d3304ed1e65feb0e23
# Parent  c12319817d7e5b80c9518242e35ff13efba07c85
[svn] - remove deprecated symbol warnings for gdk_draw_pixmap

diff -r c12319817d7e -r 48c8ecbfb282 ChangeLog
--- a/ChangeLog	Mon Dec 18 08:44:33 2006 -0800
+++ b/ChangeLog	Mon Dec 18 09:43:42 2006 -0800
@@ -1,3 +1,16 @@
+2006-12-18 16:44:33 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3327]
+  - patch to add a scrolling voiceprint to the mini visualizer.
+  Patch by: Troels Bang Jensen ([Marvin] on #audacious).
+  
+  trunk/audacious/mainwin.c       |    5 ++++-
+  trunk/audacious/visualization.c |   12 ++++++++++--
+  trunk/audacious/widgets/svis.c  |    3 +++
+  trunk/audacious/widgets/vis.c   |   40 +++++++++++++++++++++++++++++++++++++++-
+  trunk/audacious/widgets/vis.h   |    3 ++-
+  5 files changed, 58 insertions(+), 5 deletions(-)
+
+
 2006-12-18 15:31:51 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [3325]
   - suppress noise on transition from pause to stop.
diff -r c12319817d7e -r 48c8ecbfb282 audacious/widgets/playlist_list.c
--- a/audacious/widgets/playlist_list.c	Mon Dec 18 08:44:33 2006 -0800
+++ b/audacious/widgets/playlist_list.c	Mon Dec 18 09:43:42 2006 -0800
@@ -105,7 +105,7 @@
 	p = gdk_pixmap_new(in, w, h, -1);
 	gc = gdk_gc_new(p);
 
-        gdk_draw_pixmap(p, gc, in, x, y, 0, 0, w, h);
+        gdk_draw_drawable(p, gc, in, x, y, 0, 0, w, h);
 
 	gdk_error_trap_push();
 
@@ -580,7 +580,7 @@
 	if (!rootpix)
            rootpix = shade_pixmap(get_transparency_pixmap(), 0, 0, 0, 0, gdk_screen_width(), gdk_screen_height(), 
     			    skin_get_color(bmp_active_skin, SKIN_PLEDIT_NORMALBG));
-        gdk_draw_pixmap(obj, gc, rootpix, cfg.playlist_x + pl->pl_widget.x,
+        gdk_draw_drawable(obj, gc, rootpix, cfg.playlist_x + pl->pl_widget.x,
                     cfg.playlist_y + pl->pl_widget.y, pl->pl_widget.x, pl->pl_widget.y,
                     width, height);
     }
diff -r c12319817d7e -r 48c8ecbfb282 audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Mon Dec 18 08:44:33 2006 -0800
+++ b/audacious/widgets/skin.c	Mon Dec 18 09:43:42 2006 -0800
@@ -1605,8 +1605,8 @@
 
     width = MIN(width, pixmap->width - xsrc);
     height = MIN(height, pixmap->height - ysrc);
-    gdk_draw_pixmap(drawable, gc, pixmap->pixmap, xsrc, ysrc,
-                    xdest, ydest, width, height);
+    gdk_draw_drawable(drawable, gc, pixmap->pixmap, xsrc, ysrc,
+                      xdest, ydest, width, height);
 }
 
 void
diff -r c12319817d7e -r 48c8ecbfb282 audacious/widgets/textbox.c
--- a/audacious/widgets/textbox.c	Mon Dec 18 08:44:33 2006 -0800
+++ b/audacious/widgets/textbox.c	Mon Dec 18 09:43:42 2006 -0800
@@ -59,13 +59,13 @@
         cw = tb->tb_pixmap_width - tb->tb_offset;
         if (cw > tb->tb_widget.width)
             cw = tb->tb_widget.width;
-        gdk_draw_pixmap(obj, tb->tb_widget.gc, src, tb->tb_offset, 0,
-                        tb->tb_widget.x, tb->tb_widget.y, cw,
-                        tb->tb_widget.height);
+        gdk_draw_drawable(obj, tb->tb_widget.gc, src, tb->tb_offset, 0,
+                          tb->tb_widget.x, tb->tb_widget.y, cw,
+                          tb->tb_widget.height);
         if (cw < tb->tb_widget.width)
-            gdk_draw_pixmap(obj, tb->tb_widget.gc, src, 0, 0,
-                            tb->tb_widget.x + cw, tb->tb_widget.y,
-                            tb->tb_widget.width - cw, tb->tb_widget.height);
+            gdk_draw_drawable(obj, tb->tb_widget.gc, src, 0, 0,
+                              tb->tb_widget.x + cw, tb->tb_widget.y,
+                              tb->tb_widget.width - cw, tb->tb_widget.height);
     }
 }