From a89a8012c2f31021b38b503a8cae4ed2b5ce6fc7 Mon Sep 17 00:00:00 2001
From: wincent <wincent@a1c6a512-1295-4272-9138-f99709370657>
Date: Wed, 5 Aug 2009 15:09:26 +0000
Subject: [PATCH] PDBox: Got rid of warnings.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22173 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/pdbox/PDa/intern/ftom~.c     | 2 +-
 apps/plugins/pdbox/PDa/intern/samphold~.c | 2 +-
 apps/plugins/pdbox/PDa/src/g_canvas.c     | 9 ++++++---
 apps/plugins/pdbox/PDa/src/g_graph.c      | 4 +++-
 apps/plugins/pdbox/PDa/src/g_rtext.c      | 4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/plugins/pdbox/PDa/intern/ftom~.c b/apps/plugins/pdbox/PDa/intern/ftom~.c
index 0b6fa14a00..a31b02cbd3 100644
--- a/apps/plugins/pdbox/PDa/intern/ftom~.c
+++ b/apps/plugins/pdbox/PDa/intern/ftom~.c
@@ -30,7 +30,7 @@ static t_int *ftom_tilde_perform(t_int *w)
     t_sample *in = *(t_sample **)(w+1), *out = *(t_float **)(w+2);
 #endif
     t_int n = *(t_int *)(w+3);
-    for (; n--; *in++, out++)
+    for (; n--; in++, out++)
     {
     	t_sample f = *in;
 	*out = ftofix((fixtof(f) > 0 ? 17.3123405046 * log(.12231220585 * fixtof(f)) : -1500));
diff --git a/apps/plugins/pdbox/PDa/intern/samphold~.c b/apps/plugins/pdbox/PDa/intern/samphold~.c
index 8f0656c795..b750399261 100644
--- a/apps/plugins/pdbox/PDa/intern/samphold~.c
+++ b/apps/plugins/pdbox/PDa/intern/samphold~.c
@@ -32,7 +32,7 @@ static t_int *sigsamphold_perform(t_int *w)
     int i;
     t_sample lastin = x->x_lastin;
     t_sample lastout = x->x_lastout;
-    for (i = 0; i < n; i++, *in1++)
+    for (i = 0; i < n; i++, in1++)
     {
     	t_sample next = *in2++;
     	if (next < lastin) lastout = *in1;
diff --git a/apps/plugins/pdbox/PDa/src/g_canvas.c b/apps/plugins/pdbox/PDa/src/g_canvas.c
index 6b33a4af44..392017f178 100644
--- a/apps/plugins/pdbox/PDa/src/g_canvas.c
+++ b/apps/plugins/pdbox/PDa/src/g_canvas.c
@@ -95,7 +95,8 @@ static void glist_doupdatewindowlist(t_glist *gl, char *sbuf)
 	    	char tbuf[1024];
 #ifdef ROCKBOX
                 snprintf(tbuf, sizeof(tbuf),
-                    "{%s .x%x} ", gl->gl_name->s_name, (unsigned int) canvas);
+                    "{%s .x%lx} ", gl->gl_name->s_name,
+                                  (unsigned long) (t_int) canvas);
 #else /* ROCKBOX */
 		sprintf(tbuf, "{%s .x%x} ", gl->gl_name->s_name, (t_int)canvas);
 #endif /* ROCKBOX */
@@ -712,7 +713,7 @@ static t_editor *editor_new(t_glist *owner)
     x->e_deleted = binbuf_new();
     x->e_glist = owner;
 #ifdef ROCKBOX
-    snprintf(buf, sizeof(buf), ".x%x", (unsigned int) owner);
+    snprintf(buf, sizeof(buf), ".x%lx", (unsigned long) (t_int) owner);
 #else /* ROCKBOX */
     sprintf(buf, ".x%x", (t_int)owner);
 #endif /* ROCKBOX */
@@ -1071,7 +1072,9 @@ void canvas_restore(t_canvas *x, t_symbol *s, int argc, t_atom *argv)
 static void canvas_loadbangabstractions(t_canvas *x)
 {
     t_gobj *y;
-#ifndef ROCKBOX
+#ifdef ROCKBOX
+    gensym("loadbang");
+#else
     t_symbol *s = gensym("loadbang");
 #endif
     for (y = x->gl_list; y; y = y->g_next)
diff --git a/apps/plugins/pdbox/PDa/src/g_graph.c b/apps/plugins/pdbox/PDa/src/g_graph.c
index cccf8823eb..cf216cf0c7 100644
--- a/apps/plugins/pdbox/PDa/src/g_graph.c
+++ b/apps/plugins/pdbox/PDa/src/g_graph.c
@@ -138,7 +138,9 @@ void glist_clear(t_glist *x)
 
 void glist_retext(t_glist *glist, t_text *y)
 {
-#ifndef ROCKBOX
+#ifdef ROCKBOX
+    glist_getcanvas(glist);
+#else
     t_canvas *c = glist_getcanvas(glist);
 #endif
     	/* check that we have built rtexts yet.  LATER need a better test. */
diff --git a/apps/plugins/pdbox/PDa/src/g_rtext.c b/apps/plugins/pdbox/PDa/src/g_rtext.c
index 03b19c678a..ca21f5aecd 100644
--- a/apps/plugins/pdbox/PDa/src/g_rtext.c
+++ b/apps/plugins/pdbox/PDa/src/g_rtext.c
@@ -66,8 +66,8 @@ t_rtext *rtext_new(t_glist *glist, t_text *who)
     glist->gl_editor->e_rtext = x;
 #ifdef ROCKBOX
     snprintf(x->x_tag, strlen(x->x_tag),
-        ".x%x.t%x", (unsigned int) glist_getcanvas(x->x_glist),
-                    (unsigned int) x);
+        ".x%lx.t%lx", (unsigned long) (t_int) glist_getcanvas(x->x_glist),
+                      (unsigned long) (t_int) x);
 #else /* ROCKBOX */
     sprintf(x->x_tag, ".x%x.t%x", (t_int)glist_getcanvas(x->x_glist),
     	(t_int)x);
-- 
2.11.4.GIT