1
0
Fork 0
forked from len0rd/rockbox
Commit graph

643 commits

Author SHA1 Message Date
Thomas Martitz
a31624e76e Fix the mechanism to fail to parse skins if images fail to load and fix having no backdrop at all (neither %X nor backdrop setting, DancePuffDuo was broken).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24814 a1c6a512-1295-4272-9138-f99709370657
2010-02-21 19:29:33 +00:00
Jonathan Gordon
f85103e8f2 remote multifont fixes. it shoud be working again (blame AlexP! he made me break it last week!)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24812 a1c6a512-1295-4272-9138-f99709370657
2010-02-21 19:10:09 +00:00
Jonathan Gordon
eca85ac327 make sure font fd's get closed when a new skin is loaded
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24803 a1c6a512-1295-4272-9138-f99709370657
2010-02-21 02:53:50 +00:00
Tomer Shalev
516d1264f8 WPS: Use helper local variable instead of its value (no functional change)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24789 a1c6a512-1295-4272-9138-f99709370657
2010-02-20 13:26:50 +00:00
Jonathan Gordon
ccd50dd2d7 and actually fix multifont on remote lcd targets also
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24780 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 23:54:36 +00:00
Jonathan Gordon
90d9e66920 fix possible out-of-bounds error on remote lcd targets if they try loading a font to id==2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24779 a1c6a512-1295-4272-9138-f99709370657
2010-02-19 23:49:17 +00:00
Jonathan Gordon
45a181d8fc allow integer sound settings (bass, volume, etc) to be used with conditional %St. "%?St|name|<min|min+1|...|max-1|max>"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24745 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 07:04:16 +00:00
Jonathan Gordon
7dfd594cca fix yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24741 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 02:37:58 +00:00
Jonathan Gordon
3cb735ef39 basic alignment support (%a|l|c|r|L|R) in the playlist viewer. no sublines so the whole line will either be left, right or centered.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24740 a1c6a512-1295-4272-9138-f99709370657
2010-02-18 01:52:13 +00:00
Jonathan Gordon
f7ba156b27 change the %St tag so it only shows the filename of file settings, not the full path (i.e cabbiev2 instead of /.rockbox/wps/cabbiev2.wps)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24717 a1c6a512-1295-4272-9138-f99709370657
2010-02-17 07:17:06 +00:00
Teruaki Kawashima
d50c78c238 * surround member only used by charcells with #ifdef HAVE_LCD_CHARCELLS in struct scrollinfo in scroll_engine.h.
* remove function prototypes which are not actualy defined.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24693 a1c6a512-1295-4272-9138-f99709370657
2010-02-16 11:59:37 +00:00
Jonathan Gordon
877d378710 Reuse the backdrop buffers if 2 skins use the same backdrop (on the same screen of course)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24690 a1c6a512-1295-4272-9138-f99709370657
2010-02-16 05:24:27 +00:00
Jonathan Gordon
1c2aa35371 FS#10984 - multifont! 2 major additions:
1) seperate UI font for the remote and main displays
2) allow individual skins to load additional fonts for use in the skin (Uo to 7 extra in this first version) see CustomWPS for info on how to load a font in the skins.

Code should always use FONT_UI+screen_number to get the correct user font


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24644 a1c6a512-1295-4272-9138-f99709370657
2010-02-14 06:26:16 +00:00
Jonathan Gordon
7e6f124d4e revert r24478 and make the backdrop behaviour the same as it used to be (so when in the wps the sbs' backdrop will be fully disabled). Also changes the API back to having to manually set the current backdrop.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24565 a1c6a512-1295-4272-9138-f99709370657
2010-02-08 09:38:03 +00:00
Jonathan Gordon
5513c30e34 make all the RTC tokens in the skins be useable in conditionals (I dare anyone to use %cY though :D )
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24526 a1c6a512-1295-4272-9138-f99709370657
2010-02-05 23:58:53 +00:00
Jonathan Gordon
0a16a99a69 fix a bug where the backdrop from the sbs is displayed on scrolling lines in the wps when the %wd tag is not used.
I'm not crazy about this commit and maybe a better solution would be to outright disable the sbs backdrop when in any skinned screen. This then means backdrops go back to needing special handling (i.e they arnt "free")



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24478 a1c6a512-1295-4272-9138-f99709370657
2010-02-03 07:03:48 +00:00
Jonathan Gordon
bb86299b81 make sure skins always draw with their backdrop, otherwise the backdrop only changes on a full redraw which usually ends up being in the wrong order
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24435 a1c6a512-1295-4272-9138-f99709370657
2010-02-01 04:47:19 +00:00
Jonathan Gordon
03ab592c9c bugger, too tired, didnt mean to commit this.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24369 a1c6a512-1295-4272-9138-f99709370657
2010-01-29 08:26:14 +00:00
Jonathan Gordon
ae91e8b693 fix the last of the red... note to self, fix backdrop.h!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24368 a1c6a512-1295-4272-9138-f99709370657
2010-01-29 08:25:24 +00:00
Jonathan Gordon
eee5423fe1 skin rework (FS#10922) notable changes:
- simplify the setting/skin relationship. settings are used as the fallback if it's not specified in the skin
- backdrop buffers are now in the skin buffer (which has also increased slightly to accomodate 1 backdrop for each skin and 2 full colour screens for bmps (up for 1.5))
- if no %X is specified in a skin then the backdrop setting will be used. use %Xd to explicitly disable a skin from displaying a backdrop
- the base skin can now specify a backdrop.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24366 a1c6a512-1295-4272-9138-f99709370657
2010-01-29 07:52:13 +00:00
Bertrik Sikken
552835ebe2 Add a missing #include, make a function static, make touchpad_set_buttonlight implementation and declaration consistent
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24281 a1c6a512-1295-4272-9138-f99709370657
2010-01-18 21:20:36 +00:00
Jonathan Gordon
12173598e4 fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24234 a1c6a512-1295-4272-9138-f99709370657
2010-01-15 07:30:30 +00:00
Jonathan Gordon
fea4689e91 Get rid of those horrible macros to protect against NULL reference when looking up the id3 info for tokens.
Change the way the wps playlist viewer gets the token values. All %i tokens are now supported (and a few others, experiment :) )


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24233 a1c6a512-1295-4272-9138-f99709370657
2010-01-15 07:20:56 +00:00
Jonathan Gordon
51630cbac1 outright reject any tags which need a special parser in the wps playlist viewer. There is no intention of even trying to support them and without this possible upcoming changes will cause crashes if any of those tags are used.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24229 a1c6a512-1295-4272-9138-f99709370657
2010-01-15 01:26:57 +00:00
Jonathan Gordon
a1b97086c5 fix typo
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24223 a1c6a512-1295-4272-9138-f99709370657
2010-01-13 07:47:53 +00:00
Jonathan Gordon
d668900848 Fix red and yellow. HWCODEC cant see the metadata for more than the next track so only show the filename there
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24221 a1c6a512-1295-4272-9138-f99709370657
2010-01-13 06:24:21 +00:00
Jonathan Gordon
dc0ba917fa FS#10898 - Add a playlist viewer to the WPS. http://www.rockbox.org/wiki/CustomWPS#Playlist_viewer for an exaplanation how to use it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24220 a1c6a512-1295-4272-9138-f99709370657
2010-01-13 06:02:38 +00:00
Jonathan Gordon
669afd093d fix checkwps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24194 a1c6a512-1295-4272-9138-f99709370657
2010-01-07 07:47:19 +00:00
Jonathan Gordon
91e6b06be9 RTL language enhancements by Tomers Shalev and I.
3 new tokens:
%ax - the next token should follow the language direction (what that means is defined by the individual tokens)
%aL - align left on LTR language (same as %al), right on RTL languages
%aR - align right on LTR language (same as %ar), left on RTL languages

This commit adds %ax support to the %V and %Cl tokens. 


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24193 a1c6a512-1295-4272-9138-f99709370657
2010-01-07 07:34:15 +00:00
Bertrik Sikken
6fef14bd16 Set svn:keywords property on .c and .h files that didn't already have it. Correct svn:executable property on some files.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24165 a1c6a512-1295-4272-9138-f99709370657
2010-01-03 14:28:09 +00:00
Andree Buschmann
05778b501d Fix further tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24156 a1c6a512-1295-4272-9138-f99709370657
2010-01-03 10:50:34 +00:00
Bertrik Sikken
1d46959012 Make debug builds compile again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24150 a1c6a512-1295-4272-9138-f99709370657
2010-01-02 23:56:11 +00:00
Tomer Shalev
e15a0c9118 WPS: Use helper function to parse int value on album-art directive
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24121 a1c6a512-1295-4272-9138-f99709370657
2009-12-29 18:14:31 +00:00
Jonathan Gordon
ae08a21b42 Fix FS#10215 - peakmeter updates breaks scrolling lines in conditionally enalbed viewports... fix is to not disable conditional viewports during these updates which are *only* touching the pm token anyway
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24090 a1c6a512-1295-4272-9138-f99709370657
2009-12-21 06:35:31 +00:00
Bertrik Sikken
0201a19d2d Make read-only struct const
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24085 a1c6a512-1295-4272-9138-f99709370657
2009-12-20 18:04:07 +00:00
Bertrik Sikken
5698674ece Code police: add missing header file, make some local functions static
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24083 a1c6a512-1295-4272-9138-f99709370657
2009-12-20 16:28:15 +00:00
Jonathan Gordon
b2eb44ce0e FS#10824 - viewport/statusbar API rework.
Hopefully the only user visible changes are:
- fm and recording screens go by the statusbar setting (sbs or inbuilt)
- plugins go back to using the theme as they should for menus and lists
- splash screens might get cut a bit... entirely theme and splash dependant.. if there is a problematic one we can look at it later.
- hopefully nothing more than very minor screen flickerings... let me know exactly where they are so they can be fixed

New GUI screen rules:
* Screens assume that the theme (sbs+ui viewport+ maybe background image) are always enabled. They may be disabled on a per display basis, but MUST be re-enabled on exit
* Screens must not be coded in a way that requires a statusbar of any type.. the inbuilt bar will be removed shortly.
ALWAYS RESPECT THE USERS SETTINGS unless the screen requires the full display to fit.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23904 a1c6a512-1295-4272-9138-f99709370657
2009-12-09 07:25:46 +00:00
Tomer Shalev
8db32ddfee Skin parser: Use parse_list() when possible
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23846 a1c6a512-1295-4272-9138-f99709370657
2009-12-04 13:10:06 +00:00
Jonathan Gordon
58ca43dc9d fix FS#10674 - make skin debugger count the lines correctly so the line number in the output is actually useful!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23825 a1c6a512-1295-4272-9138-f99709370657
2009-12-03 05:36:23 +00:00
Jonathan Gordon
85bcd1eaf7 fix segfault on %Rb token
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23798 a1c6a512-1295-4272-9138-f99709370657
2009-11-30 02:16:36 +00:00
Jonathan Gordon
4966666062 fix mono recording token,
Add %bu - usb powered token


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23713 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 19:09:54 +00:00
Jonathan Gordon
6c3c8a866c hopefully fix the sameplrate token
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23690 a1c6a512-1295-4272-9138-f99709370657
2009-11-22 02:10:41 +00:00
Thomas Martitz
bdf2961ba3 Fix some drawing problems when displaying the WPS initially with sbs enabled. Move initial display of the wps to wps.c too. Should fix bug 3 of FS#10771.
Also change GUI_EVENT_REFRESH event handling so that the passed drawing function is always called, not only when sbs or custom ui vp are used.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23644 a1c6a512-1295-4272-9138-f99709370657
2009-11-16 01:38:30 +00:00
Tomer Shalev
ec0f4b4044 FS#10783 - WPS translation
- Use the %Sx skin tag in WPS to translate 'Next Track', 'Next', and 'of' (X of Y tracks)
- New conditional skin token 'Sr' which checks whether the currently loaded language is an RTL language (Hebrew/Arabic). It uses lang_is_rtl().
- Added Hebrew translation


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23638 a1c6a512-1295-4272-9138-f99709370657
2009-11-15 21:39:39 +00:00
Jeffrey Goode
0212de4c8d Add crossfade feature tag, update manual, fix crossfade WPS tag behavior
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23610 a1c6a512-1295-4272-9138-f99709370657
2009-11-11 17:38:00 +00:00
Jeffrey Goode
dd93ef41bb HAVE_CROSSFADE defs: fix yellow and red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23598 a1c6a512-1295-4272-9138-f99709370657
2009-11-10 04:21:40 +00:00
Frank Gevaerts
8c15799e70 Implement %Ss for playback speed
This is similar to %Sp for pitch.  The conditional form %?Ss<...> is also
supported in the same way as FS#10680; you can use

    %?Ss<%xdAa|%xdAb|>

to show an icon of a tortoise (subpicture 1 of image A) or a hare
(subpicture 2 of image A) when not playing at the normal speed.

Flyspray: FS#10681
Author: Junio C Hamano



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23591 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 17:57:17 +00:00
Frank Gevaerts
7de32efe1c Don't define pitch_speed_enum() on MAS3507D. Fixes yellow
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23590 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 17:51:36 +00:00
Frank Gevaerts
a20d77dba0 Allow %?Sp<...> to be used as a conditional
When there are two choices (i.e. boolean), choose the first one if the
pitch is different from the normal value, and choose the second one if the
pitch is the same as the normal value.

When there are more than two choices (i.e. enum), the left half of the
choices are used to show 0..normal range, and the right half of the
choices are used to show values over that range.  The last entry is used
when it is set to the normal setting, following the rockbox convention to
use the last entry for special values.

  2 items: %?Sp<0..99 or 101..infinity|100>
  3 items: %?Sp<0..99|101..infinity|100>
  4 items: %?Sp<0..49|50..99|101..infinity|100>
  5 items: %?Sp<0..49|50..99|101..149|150..infinity|100>
  6 items: %?Sp<0..33|34..66|67..99|101..133|134..infinity|100>
  7 items: %?Sp<0..33|34..66|67..99|101..133|134..167|167..infinity|100>

This will allow two expected use cases:

 (1) %?Sp<%Sp> to show the pitch only when playing at a modified pitch.

 (2) %?Sp<%xdAa|%xdAb|> to show an icon of Darth Vader (subpicture 1
     of image A) when playing at a lower pitch than the original, and to
     show an icon of a chipmunk (subpicture 2 of image A) when playing at
     a higher pitch than the original.  When playing at a normal pitch,
     nothing is shown.

Flyspray: FS#10680
Author: Junio C Hamano



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23589 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 17:43:46 +00:00
Jonathan Gordon
892332ce87 fix red.. markers need to be outside #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23574 a1c6a512-1295-4272-9138-f99709370657
2009-11-09 05:03:33 +00:00