several small fixes sugested by different people (FireFly, Lear, Takka)

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

4 files changed, 5 insertions, 12 deletions

diff --git a/apps/bookmark.c b/apps/bookmark.c
index 8980e4fc26..ce82f77742 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -207,9 +207,7 @@ bool bookmark_autobookmark(void)
             return write_bookmark(false);
     }
 #ifdef HAVE_LCD_BITMAP
-    unsigned char *lines[]={str(LANG_AUTO_BOOKMARK_QUERY),
-                            str(LANG_CONFIRM_WITH_PLAY_RECORDER),
-                            str(LANG_CANCEL_WITH_ANY_RECORDER)};
+    unsigned char *lines[]={str(LANG_AUTO_BOOKMARK_QUERY);
     struct text_message message={(char **)lines, 3};
 #else
     unsigned char *lines[]={str(LANG_AUTO_BOOKMARK_QUERY),
diff --git a/firmware/common/unicode.c b/firmware/common/unicode.c
index 4e1b78f9e1..e2e2dc2f3a 100644
--- a/firmware/common/unicode.c
+++ b/firmware/common/unicode.c
@@ -92,7 +92,7 @@ unsigned char* utf8encode(unsigned long ucs, unsigned char *utf8)
     int tail = 0;
 
     if (ucs > 0x7F)
-        while (ucs >> (6*tail + 2))
+        while (ucs >> (5*tail + 6))
             tail++;
 
     *utf8++ = (ucs >> (6*tail)) | utf8comp[tail];
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index b5f1ef83c7..5b1a543f2d 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -920,10 +920,9 @@ static struct trackdata *add_track_to_tag_list(const char *filename)
     track->mempos = audiobuf_write;
     track->id3.elapsed = 0;
 #ifdef HAVE_LCD_BITMAP
-    int w, h;
-    lcd_getstringsize(track->id3.title, &w, &h);
-    lcd_getstringsize(track->id3.artist, &w, &h);
-    lcd_getstringsize(track->id3.album, &w, &h);
+    lcd_getstringsize(track->id3.title, NULL, NULL);
+    lcd_getstringsize(track->id3.artist, NULL, NULL);
+    lcd_getstringsize(track->id3.album, NULL, NULL);
 #endif
 
     track_write_idx = (track_write_idx+1) & MAX_TRACK_ENTRIES_MASK;
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 57ffbdf749..1942071565 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -78,10 +78,6 @@ sub buildzip {
         # no codec was copied, remove directory again
         rmdir(".rockbox/codecs");
 
-    system("$ROOT/tools/codepages");
-    my $c = 'find . -name "*.cp" ! -empty -exec mv {} .rockbox/codepages/ \; >/dev/null 2>&1';
-    print `$c`;
-
     }