Fix yellow and all the shipped themes that show AA

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26697 a1c6a512-1295-4272-9138-f99709370657

16 files changed, 16 insertions, 16 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index 293358bb0a..c7957e7b9a 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1482,7 +1482,7 @@ static int parse_albumart_display(const char *wps_bufptr,
                                       struct wps_data *wps_data)
 {
     (void)wps_bufptr;
-    struct wps_token *prev = token-1;
+    (void)token;
     if (wps_data->albumart)
     {
         wps_data->albumart->vp = &curr_vp->vp;
diff --git a/wps/boxes.112x64x1.wps b/wps/boxes.112x64x1.wps
index 5ef375b6ad..c29658ec73 100644
--- a/wps/boxes.112x64x1.wps
+++ b/wps/boxes.112x64x1.wps
@@ -14,6 +14,6 @@
 %ac%t(5)%s%?It<%It|%Fn>;%ac%t(5)%s%?Ia<%Ia|%D(2)>
 %?pv<%xd(Aa)|%xd(Ab)|%xd(Ac)|%xd(Ad)|%xd(Ae)|%xd(Af)|%xd(Ag)|%xd(Ah)|%xd(Ai)|%xd(Aj)|%xd(Ak)>
 %?bp<%xd(Ba)|%?bl<%xd(Bb)|%xd(Bc)|%xd(Bd)|%xd(Be)|%xd(Bf)>>
-%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%Cd>
+%?mm<|%xd(Ca)|%xd(Cb)|%xd(Cc)|%xd(Cd)>
 %?mp<%xd(Da)|%xd(Db)|%xd(Dc)|%xd(Dd)|%xd(De)>
 %?ps<%xd(E)|>
diff --git a/wps/cabbiev2.128x128x16.wps b/wps/cabbiev2.128x128x16.wps
index dc06bc5a31..caca739b5a 100644
--- a/wps/cabbiev2.128x128x16.wps
+++ b/wps/cabbiev2.128x128x16.wps
@@ -19,7 +19,7 @@
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 
 #NowPlaying - with AA
diff --git a/wps/cabbiev2.128x128x2.wps b/wps/cabbiev2.128x128x2.wps
index d092c59da9..17dfcfa88a 100644
--- a/wps/cabbiev2.128x128x2.wps
+++ b/wps/cabbiev2.128x128x2.wps
@@ -19,7 +19,7 @@
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 
 #NowPlaying - with AA
diff --git a/wps/cabbiev2.132x80x16.wps b/wps/cabbiev2.132x80x16.wps
index 8878279925..29342dfdac 100644
--- a/wps/cabbiev2.132x80x16.wps
+++ b/wps/cabbiev2.132x80x16.wps
@@ -10,7 +10,7 @@
 %xl(F,playmode-132x80x16.bmp,118,67,5)
 %ax%Cl(3,14,40,40,c,c)
 %pb(pb-132x80x16.bmp,2,58,127,6)
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 #Images
 %?mh<%xd(Aa)|%xd(Ab)>
diff --git a/wps/cabbiev2.138x110x2.wps b/wps/cabbiev2.138x110x2.wps
index 6325461b4a..081e38d84f 100644
--- a/wps/cabbiev2.138x110x2.wps
+++ b/wps/cabbiev2.138x110x2.wps
@@ -19,7 +19,7 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 %ax%Vl(a,65,10,-,60,1)
 %s%al%?it<%it|%fn>
diff --git a/wps/cabbiev2.160x128x16.wps b/wps/cabbiev2.160x128x16.wps
index 4c5b112aaf..b1477b452f 100644
--- a/wps/cabbiev2.160x128x16.wps
+++ b/wps/cabbiev2.160x128x16.wps
@@ -17,7 +17,7 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 # NowPlaying - AA
 %ax%Vl(a,77,10,-,75,1)
diff --git a/wps/cabbiev2.160x128x2.wps b/wps/cabbiev2.160x128x2.wps
index 70e8bd5faf..39876c9073 100644
--- a/wps/cabbiev2.160x128x2.wps
+++ b/wps/cabbiev2.160x128x2.wps
@@ -19,7 +19,7 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 %ax%Vl(a,70,10,-,75,1)
 %s%al%?it<%it|%fn>
diff --git a/wps/cabbiev2.176x132x16.wps b/wps/cabbiev2.176x132x16.wps
index 38dddd15c5..3be806d902 100644
--- a/wps/cabbiev2.176x132x16.wps
+++ b/wps/cabbiev2.176x132x16.wps
@@ -18,7 +18,7 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%C%Vd(a)|%Vd(b)>
+%?C<%Cd%Vd(a)|%Vd(b)>
 
 #NowPlaying
 %ax%Vl(a,81,12,-,74,1)
diff --git a/wps/cabbiev2.176x220x16.wps b/wps/cabbiev2.176x220x16.wps
index 86838bef62..5a3416876d 100644
--- a/wps/cabbiev2.176x220x16.wps
+++ b/wps/cabbiev2.176x220x16.wps
@@ -33,4 +33,4 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%C>
+%?C<%Cd>
diff --git a/wps/cabbiev2.220x176x16.wps b/wps/cabbiev2.220x176x16.wps
index 10fa408980..c88c74b1ef 100644
--- a/wps/cabbiev2.220x176x16.wps
+++ b/wps/cabbiev2.220x176x16.wps
@@ -19,7 +19,7 @@
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
 #NowPlaying
-%?C<%Vd(a)%C|%Vd(b)>
+%?C<%Vd(a)%Cd|%Vd(b)>
 
 %ax%Vl(a,105,30,-,90,1)
 %s%al%?it<%it|%fn>
diff --git a/wps/cabbiev2.240x320x16.mini2440.wps b/wps/cabbiev2.240x320x16.mini2440.wps
index 85f326428a..8733ac41a8 100644
--- a/wps/cabbiev2.240x320x16.mini2440.wps
+++ b/wps/cabbiev2.240x320x16.mini2440.wps
@@ -42,5 +42,5 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fc)|%xd(Fb)|%xd(Fd)|%xd(Fe)>
-%?C<%C>
+%?C<%Cd>
 
diff --git a/wps/cabbiev2.240x320x16.wps b/wps/cabbiev2.240x320x16.wps
index 02d1a60800..b667e6b0eb 100644
--- a/wps/cabbiev2.240x320x16.wps
+++ b/wps/cabbiev2.240x320x16.wps
@@ -37,5 +37,5 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
-%?C<%C>
+%?C<%Cd>
 
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps
index 6fedecaa8f..94c7109d98 100644
--- a/wps/cabbiev2.240x400x16.wps
+++ b/wps/cabbiev2.240x400x16.wps
@@ -32,7 +32,7 @@
 
      %pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr     
 
-%?C<%C>
+%?C<%Cd>
 
 %xl(A,lock-240x320x16.bmp,11,0,2)
 %xl(B,battery-240x320x16.bmp,46,0,10)
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps
index cec4fa73fb..f6e70d52f3 100644
--- a/wps/cabbiev2.320x240x16.mrobe500.wps
+++ b/wps/cabbiev2.320x240x16.mrobe500.wps
@@ -26,7 +26,7 @@
 %?ps<%xd(D)>
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fc)|%xd(Fb)|%xd(Fd)|%xd(Fe)>
-%?C<%Vd(a)%C|%Vd(b)>
+%?C<%Vd(a)%Cd|%Vd(b)>
 #NowPlaying
 
 %Vl(a,153,30,-,130,1)
diff --git a/wps/cabbiev2.320x240x16.wps b/wps/cabbiev2.320x240x16.wps
index cf34a95572..1c6ddb6383 100644
--- a/wps/cabbiev2.320x240x16.wps
+++ b/wps/cabbiev2.320x240x16.wps
@@ -18,7 +18,7 @@
 %?mm<|%xd(Ea)|%xd(Eb)|%xd(Ec)|%xd(Ed)>
 %?mp<%xd(Fa)|%xd(Fb)|%xd(Fc)|%xd(Fd)|%xd(Fe)>
 
-%?C<%Vd(a)%C|%Vd(b)>
+%?C<%Vd(a)%Cd|%Vd(b)>
 #NowPlaying
 
 %ax%Vl(a,153,30,-,130,1)