woops, revert test code

Change-Id: Ida0ef9e4d81520314d3757009d18f7b22accc1e4
simplelist: Fix simplelist_set_line_count() so it actually sets the count
2013-03-29 13:41:48 +11:00 · 2013-03-29 13:41:48 +11:00 · 2013-03-10 14:10:13 +01:00 · 2013-03-10 12:18:58 +01:00 · 2013-03-05 22:39:32 +01:00 · 2013-03-05 20:45:16 +00:00
17 changed files with 12127 additions and 11909 deletions
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@ -843,8 +843,12 @@ void simplelist_set_line_count(int lines)
        simplelist_line_remaining = sizeof(simplelist_buffer);
        simplelist_line_count = 0;
    }
-    else if (lines >= SIMPLELIST_MAX_LINES)
-        simplelist_line_count = SIMPLELIST_MAX_LINES;
+    else if (lines < simplelist_line_count) {
+        char *end = simplelist_text[lines];
+        simplelist_line_pos = end - simplelist_buffer;
+        simplelist_line_remaining = sizeof(simplelist_buffer) - simplelist_line_pos;
+        simplelist_line_count = lines;
+    }
 }
 /* get the current amount of lines shown */
 int simplelist_get_line_count(void)
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@ -1198,13 +1198,9 @@ static int parse_albumart_load(struct skin_element* element,
    /* if we got here, we parsed everything ok .. ! */
    if (aa->width < 0)
        aa->width = 0;
-    else if (aa->width > curr_vp->vp.width)
-        aa->width = curr_vp->vp.width;

    if (aa->height < 0)
        aa->height = 0;
-    else if (aa->height > curr_vp->vp.height)
-        aa->height = curr_vp->vp.height;

    if (swap_for_rtl)
        aa->x = (curr_vp->vp.width - aa->width - aa->x);
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@ -254,27 +254,17 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
            case SKIN_TOKEN_METADATA_GENRE:
                return id3->genre_string;
            case SKIN_TOKEN_METADATA_DISC_NUMBER:
-                if (id3->disc_string) {
-                    if (intval)
-                        *intval = atoi(id3->disc_string);
+                if (id3->disc_string)
                    return id3->disc_string;
-                }
                if (id3->discnum) {
-                    if (intval)
-                        *intval = id3->discnum;
                    snprintf(buf, buf_size, "%d", id3->discnum);
                    return buf;
                }
                return NULL;
            case SKIN_TOKEN_METADATA_TRACK_NUMBER:
-                if (id3->track_string) {
-                    if (intval)
-                        *intval = atoi(id3->track_string);
+                if (id3->track_string)
                    return id3->track_string;
-                }
                if (id3->tracknum) {
-                    if (intval)
-                        *intval = id3->tracknum;
                    snprintf(buf, buf_size, "%d", id3->tracknum);
                    return buf;
                }
--- a/apps/lang/bulgarian.lang
+++ b/apps/lang/bulgarian.lang
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@ -351,10 +351,10 @@
    *: "Balance"
  </source>
  <dest>
-    *: "左右声道平衡"
+    *: "声道平衡"
  </dest>
  <voice>
-    *: "左右声道平衡"
+    *: "声道平衡"
  </voice>
 </phrase>
 <phrase>
@ -976,11 +976,11 @@
  </source>
  <dest>
    *: none
-    swcodec: "低通滤波器"
+    swcodec: "低架滤波器"
  </dest>
  <voice>
    *: none
-    swcodec: "低通滤波器"
+    swcodec: "低架滤波器"
  </voice>
 </phrase>
 <phrase>
@ -1010,11 +1010,11 @@
  </source>
  <dest>
    *: none
-    swcodec: "高通滤波器"
+    swcodec: "高架滤波器"
  </dest>
  <voice>
    *: none
-    swcodec: "高通滤波器"
+    swcodec: "高架滤波器"
  </voice>
 </phrase>
 <phrase>
@ -1464,10 +1464,10 @@
    *: "Initialize Now"
  </source>
  <dest>
-    *: "立即初始化"
+    *: "初始化媒体库"
  </dest>
  <voice>
-    *: "立即初始化"
+    *: "初始化媒体库"
  </voice>
 </phrase>
 <phrase>
@ -1506,10 +1506,10 @@
    *: "Gather Runtime Data"
  </source>
  <dest>
-    *: "记录音乐播放记录"
+    *: "记录音乐播放历史"
  </dest>
  <voice>
-    *: "记录音乐播放记录"
+    *: "记录音乐播放历史"
  </voice>
 </phrase>
 <phrase>
@ -7160,7 +7160,7 @@
    *: "Boot changed"
  </source>
  <dest>
-    *: "引导文件已经更新"
+    *: "引导文件已被更新"
  </dest>
  <voice>
    *: "引导文件已经被更新"
@ -7174,10 +7174,10 @@
    *: "Reboot now?"
  </source>
  <dest>
-    *: "现在就重启?"
+    *: "是否立即重新启动?"
  </dest>
  <voice>
-    *: "现在就重启吗"
+    *: "是否立即重新启动播放器"
  </voice>
 </phrase>
 <phrase>
@ -7673,10 +7673,10 @@
    *: "Update Now"
  </source>
  <dest>
-    *: "立即更新"
+    *: "更新媒体库"
  </dest>
  <voice>
-    *: "立即更新"
+    *: "更新媒体库"
  </voice>
 </phrase>
 <phrase>
@ -7701,10 +7701,10 @@
    *: "Export Modifications"
  </source>
  <dest>
-    *: "导出修改"
+    *: "导出媒体库"
  </dest>
  <voice>
-    *: "导出修改"
+    *: "导出媒体库"
  </voice>
 </phrase>
 <phrase>
@ -8100,10 +8100,10 @@
    *: "Import Modifications"
  </source>
  <dest>
-    *: "导入更改"
+    *: "导入媒体库"
  </dest>
  <voice>
-    *: "导入更改"
+    *: "导入媒体库"
  </voice>
 </phrase>
 <phrase>
@ -9128,10 +9128,10 @@
    *: "Playlist Catalogue"
  </source>
  <dest>
-    *: "播放列表选项"
+    *: "播放列表目录"
  </dest>
  <voice>
-    *: "播放列表选项"
+    *: "播放列表目录"
  </voice>
 </phrase>
 <phrase>
@ -9359,10 +9359,10 @@
    *: "Please reboot to enable"
  </source>
  <dest>
-    *: "重启后启用"
+    *: "重新启动以完成初始化"
  </dest>
  <voice>
-    *: "重启后启用"
+    *: "重新启动您的播放器以完成初始化"
  </voice>
 </phrase>
 <phrase>
@ -12440,10 +12440,10 @@
    *: "Filesize"
  </source>
  <dest>
-    *: "按照文件大小"
+    *: "文件大小"
  </dest>
  <voice>
-    *: "按照文件大小"
+    *: "文件大小"
  </voice>
 </phrase>
 <phrase>
@ -12924,10 +12924,10 @@
    *: "Restart Sleep Timer On Keypress"
  </source>
  <dest>
-    *: "按键时重启睡眠计时器"
+    *: "按键时重置睡眠计时器"
  </dest>
  <voice>
-    *: "按键时重启睡眠计时器"
+    *: "按键时重置睡眠计时器"
  </voice>
 </phrase>
 <phrase>
@ -13003,3 +13003,17 @@
    *: "开机即启动睡眠计时器"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_SELECT_DATABASE_DIRS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select directories to scan"
+  </source>
+  <dest>
+    *: "仅扫描指定文件夹"
+  </dest>
+  <voice>
+    *: "扫描媒体时扫描指定文件夹"
+  </voice>
+</phrase>
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@ -12907,54 +12907,6 @@
    *: "Mise en cache des caractères"
  </voice>
 </phrase>
-<phrase>
-  id: LANG_KEYCLICK_HARDWARE
-  desc: in keyclick settings menu
-  user: core
-  <source>
-    *: none
-    hardware_click: "Speaker Keyclick"
-  </source>
-  <dest>
-    *: none
-    hardware_click: "Clic de la touche haut-parleur"
-  </dest>
-  <voice>
-    *: none
-    hardware_click: "Clic de la touche haut-parleur"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_KEYCLICK_SOFTWARE
-  desc: in keyclick settings menu
-  user: core
-  <source>
-    *: none
-    hardware_click: "Headphone Keyclick"
-  </source>
-  <dest>
-    *: none
-    hardware_click: "Clic de la touche écouteur"
-  </dest>
-  <voice>
-    *: none
-    hardware_click: "Clic de la touche écouteur"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SHORTCUTS
-  desc: Title in the shortcuts menu
-  user: core
-  <source>
-    *: "Shortcuts"
-  </source>
-  <dest>
-    *: "Raccourcis"
-  </dest>
-  <voice>
-    *: "Raccourcis"
-  </voice>
-</phrase>
 <phrase>
  id: LANG_STARTUP_SHUTDOWN
  desc: in the general settings menu
@ -12983,3 +12935,124 @@
    *: "Redémarrer la mise en veille programmable sur pression d'une touche"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_SELECT_FOLDER
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select one or more directories"
+  </source>
+  <dest>
+    *: "Sélectionnez un ou plusieurs dossier"
+  </dest>
+  <voice>
+    *: "Sélectionnez un ou plusieurs dossier"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_MEIER
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Simple (Meier)"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Simple (Meier)"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Simple"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SLEEP_TIMER_START_CURRENT
+  desc: shown when a sleep timer isn't running
+  user: core
+  <source>
+    *: "Start Sleep Timer"
+  </source>
+  <dest>
+    *: "Démarrer la minuterie d'arrêt"
+  </dest>
+  <voice>
+    *: "Démarrer la minuterie d'arrêt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECT_DATABASE_DIRS
+  desc: in settings_menu
+  user: core
+  <source>
+    *: "Select directories to scan"
+  </source>
+  <dest>
+    *: "Sélectionnez les dossiers à explorer"
+  </dest>
+  <voice>
+    *: "Sélectionnez les dossiers à explorer"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CODEPAGE_WESTERN_EUROPEAN
+  desc: in codepage setting menu
+  user: core
+  <source>
+    *: "Europe de l'Est (CP1252)"
+  </source>
+  <dest>
+    *: "Europe de l'Est (CP1252)"
+  </dest>
+  <voice>
+    *: "Europe de l'Est"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_CUSTOM
+  desc: in sound settings
+  user: core
+  <source>
+    *: none
+    swcodec: "Custom"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Personnalisé"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Personnalisé"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USE_SHORTCUTS_INSTEAD_OF_QS
+  desc: in settings_menu.
+  user: core
+  <source>
+    *: none
+    quickscreen: "Use Shortcuts Menu Instead of Quick Screen"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Utiliser les raccourcis au lieu des réglages rapides"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Utiliser les raccourcis au lieu des réglages rapides"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CONSTRAIN_NEXT_FOLDER
+  desc: in settings_menu. Whether LANG_NEXT_FOLDER should be constrained to directories within LANG_SET_AS_START_DIR
+  user: core
+  <source>
+    *: "Constrain Auto-Change"
+  </source>
+  <dest>
+    *: "Restreindre le changement de répertoire auto"
+  </dest>
+  <voice>
+    *: "Restreindre le changement de répertoire auto"
+  </voice>
+</phrase>
--- a/debian/README.Debian
+++ b/debian/README.Debian
@ -1,4 +1,4 @@
-rockbox 3.12.x for Maemo
+rockbox 3.13.x for Maemo
 --------------------------

 Rockbox for maemo technial preview release.
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,9 @@
+rockbox (2013-03-10maemo1) unstable; urgency=low
+
+  * Update to rockbox 3.13 code base (v3.13-final)
+
+ -- Thomas Jarosch <tomj@simonv.com>  Sun, 10 Mar 2013 19:00:00 +0100
+
 rockbox (2012-12-26maemo1) unstable; urgency=low

  * Update to rockbox 3.12 code base (v3.12-final)
--- a/debian/control
+++ b/debian/control
@ -17,7 +17,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Rockbox open source high quality audio player
 XB-Maemo-Display-Name: Rockbox audio player
-XB-Maemo-Upgrade-Description: Update to rockbox 3.12 code base
+XB-Maemo-Upgrade-Description: Update to rockbox 3.13 code base
 XSBC-Bugtracker: http://www.rockbox.org/tracker/
 XB-Maemo-Icon-26:
 iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c
--- a/debian/copyright
+++ b/debian/copyright
@ -5,7 +5,7 @@ It was downloaded from www.rockbox.org / svn://svn.rockbox.org/rockbox/trunk

 Upstream Author: The rockbox team - see docs/CREDITS for all the names

-Copyright: 2001-2012 - The rockbox team
+Copyright: 2001-2013 - The rockbox team

 License:

--- a/firmware/export/config/archosrecorder.h
+++ b/firmware/export/config/archosrecorder.h
@ -14,7 +14,7 @@
 #define HAVE_LCD_BITMAP

 /* define this if you can flip your LCD */
-#define HAVE_LCD_FLIP
+//#define HAVE_LCD_FLIP

 /* define this if you can invert the colours on your LCD */
 #define HAVE_LCD_INVERT
@ -48,7 +48,7 @@
 #define CONFIG_KEYPAD RECORDER_PAD

 /* Define this to enable morse code input */
-#define HAVE_MORSE_INPUT
+//#define HAVE_MORSE_INPUT

 /* define this if you have a real-time clock */
 #define CONFIG_RTC RTC_M41ST84W
--- a/packaging/pandora/PXML.xml
+++ b/packaging/pandora/PXML.xml
@ -6,7 +6,7 @@
    <author name="Thomas Jarosch" website="http://www.rockbox.org"/>

    <!-- Note: Another version tag below -->
-    <version major="3" minor="12" release="x" build="1"/>
+    <version major="3" minor="13" release="x" build="1"/>

    <titles>
      <title lang="en_US">Rockbox</title>
@ -34,7 +34,7 @@

    <author name="The rockbox team" website="http://www.rockbox.org"/>

-    <version major="3" minor="12" release="x" build="1"/>
+    <version major="3" minor="13" release="x" build="1"/>

    <osversion major="1" minor="0" release="0" build="0"/>

--- a/tools/builds.pm
+++ b/tools/builds.pm
@ -1,8 +1,8 @@
-$publicrelease="3.12";
-$manualrelease="3.12";
-$voicerelease="3.12";
-$releasedate="06 October 2012";
-$releasenotes="/wiki/ReleaseNotes312";
+$publicrelease="3.13";
+$manualrelease="3.13";
+$voicerelease="3.13";
+$releasedate="05 March 2013";
+$releasenotes="/wiki/ReleaseNotes313";

 %builds = (
    'archosav300' => {
--- a/tools/release/bins.pl
+++ b/tools/release/bins.pl
@ -1,5 +1,5 @@
 #!/usr/bin/perl
-$version="3.11.1";
+$version="3.13";

 require "tools/builds.pm";

--- a/tools/release/manuals.pl
+++ b/tools/release/manuals.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl

-$version="3.11.1";
+$version="3.13";

 require "tools/builds.pm";

--- a/tools/release/voices.pl
+++ b/tools/release/voices.pl
@ -1,6 +1,6 @@
 #!/usr/bin/perl

-$version="3.11.1";
+$version="3.13";

 require "tools/builds.pm";

--- a/utils/common/gitscraper.py
+++ b/utils/common/gitscraper.py
@ -80,7 +80,7 @@ def get_lstree(repo, start, filterlist=[]):
        return objects

    for line in cmdout[0].decode().split('\n'):
-        regex = re.findall(b'([0-9]+)\s+([a-z]+)\s+([0-9a-f]+)\s+(\S+)',
+        regex = re.findall(b'([0-9]+)\s+([a-z]+)\s+([0-9a-f]+)\s+(.*)',
                line.encode())
        for rf in regex:
            # filter
Author	SHA1	Message	Date
Jonathan Gordon	0bcd284497	woops, revert test code Change-Id: Ida0ef9e4d81520314d3757009d18f7b22accc1e4	2013-03-29 13:41:48 +11:00
Jonathan Gordon	087ff2e590	simplelist: Fix simplelist_set_line_count() so it actually sets the count (hopefully) Fixes FS#12838 Change-Id: I932184afaf7b65121a0c459cd03c8482e3bad22b	2013-03-29 13:41:48 +11:00
Thomas Jarosch	be394af7d4	Prepare unofficial pandora release The code is based on the 'v3.13-final' tag. Change-Id: Id2616ea478f9c9b76bb3307d03d1d043ec81074f	2013-03-10 14:10:13 +01:00
Thomas Jarosch	60dc448725	Prepare new maemo release Ideally this commit should go on top of the v3.13 branch since the release is based on the v3.13 code base. Change-Id: If13cf87463c7a3f7a9c2c96c916c543c9d2ed1a5	2013-03-10 12:18:58 +01:00
Frank Gevaerts	e25a861df2	Make the tarball generation tool handle spaces in filenames <insert opinion on such filenames here> Change-Id: Ie1b5fac97eea93c9ac934ffb8bf6c0d9a0559339	2013-03-05 22:39:32 +01:00
Frank Gevaerts	9ba57400c4	Disable LCD_FLIP and MORSE_INPUT on recorder to make it build Disabling these two settings makes the image small enough to build again. Change-Id: I77c34c1e714fb6e132ed0ce39f0917779efe1125	2013-03-05 20:45:16 +00:00
Alex Parker	0ad9df9625	Update bulgarian.lang by Zahari Yurukov Change-Id: I4995a410f44f5f189598989aa1b89baa2eb7a0a2	2013-03-05 19:05:03 +00:00
Alex Parker	9b9e13e4fb	Sort bulgarian.lang into english.lang order Change-Id: I3ec1c2924f595929e4e7d5e4fee46bd05c40e1ea	2013-03-05 19:03:37 +00:00
Alex Parker	22337b6913	Backport `d8a3871` - Update French by Amaury Pouly Change-Id: I1da3f36722b24193f580cff2825ff41601fabb55	2013-03-05 18:21:10 +00:00
PurlingNayuki	677fc91476	update Chinese(Simplified) translation added a missing string and some other fixes Change-Id: I153f42687cf855835b7a41b5b3adc4bf120f7f61	2013-03-05 18:13:12 +00:00
Alex Parker	e076912198	Bump version numbers for 3.13 Change-Id: Ie2d21951ca06a6ae3d02e1e9506677ce2a82c2f1	2013-03-05 17:53:32 +00:00
Jonathan Gordon	c25c5aaded	Revert "skin tags: fix the id3 track/disc numbers in conditionals" This reverts commit `a395a34671`.	2013-02-28 16:54:26 +11:00
Jonathan Gordon	22803114c8	skin engine: Relax the AA load width/height checks `d6c6c07` changed the AA load tag to make sure the image width/heights fit in the viewport, Revert this because it doesn't actually make sense to check it here. Change-Id: I3fe4b074ef8fe88560f2f894ec651027ea3642f4	2013-02-26 20:48:37 +11:00