Commit graph

127 commits

Author SHA1 Message Date
Osborne Jacobs
fb30d01372 Fix minor bookmark problems/Enhance bookmark functions
This fix:

-fixes when the bookmark menu and submenus are displayed and hidden
 in the context menu.
     -'Create Bookmark' should be hidden when tracks are queued in
      the playlist or nothing is currently playing (previously it was
      never hidden)
     -'List Bookmarks' should be hidden if and only if no bookmark
      file exists for the current playlist (previously it was hidden
      if tracks were queued or nothing was playing neither of which
      hinder loading bookmarks)
     -'Bookmarks' main menu should be hidden if both 'Create
      Bookmarks' and 'List Bookmarks' submenus are hidden

-fixes a problem where the 'Bookmark Error' message was not always
 displayed on bookmarking failure

-adds BOOKMARK_USB_CONNECTED return value to the bookmark functions
 to distinguish if the bookmark list was exited due to a USB
 connection.

-fixes other minor logic problems in the bookmarking functions

Change-Id: If6394b2e77f027773a7c94ffdcb52dbb15e2922b
Reviewed-on: http://gerrit.rockbox.org/177
Reviewed-by: Osborne Jacobs <ozziejacks@gmail.com>
Tested-by: Osborne Jacobs <ozziejacks@gmail.com>
Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
2012-03-12 08:54:02 +01:00
Osborne Jacobs
bcfa783100 Set %cs(Current Screen) to "Bookmark browser" when listing bookmarks from the Context Menu
Currently when you select list bookmarks from the context menu %cs returns
"Context Menu" when in the bookmark browser screen.  This change makes %cs
return "Bookmark browser" when listing bookmarks from the context menu, the
same as when you list recent bookmarks.  This change will make it possible
to determin that you are on a bookmark browser screen when skinning using
an sbs file.

Change-Id: I7fb93525fbafb5d14bba2ae5df7a78df908d09ae
Reviewed-on: http://gerrit.rockbox.org/169
Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
2012-03-03 10:41:52 +01:00
Michael Sevakis
29b5b32c33 Bookmarking no longer need worry about inability to speak while paused on SWCODEC.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30336 a1c6a512-1295-4272-9138-f99709370657
2011-08-21 21:21:40 +00:00
Jonathan Gordon
0bba82bf94 woops
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30262 a1c6a512-1295-4272-9138-f99709370657
2011-08-07 09:35:50 +00:00
Jonathan Gordon
835683b442 %cs (current screen) changes:
* Every top level menu item now has a different screen number
* Playlist viewer and Playlist Catalogue browsers no longer share the same number

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30261 a1c6a512-1295-4272-9138-f99709370657
2011-08-07 08:39:56 +00:00
Nils Wallménius
2e3162f039 Fix 2 'set but not used' warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29922 a1c6a512-1295-4272-9138-f99709370657
2011-05-24 10:56:01 +00:00
Bertrik Sikken
ab99e941db More tab fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29840 a1c6a512-1295-4272-9138-f99709370657
2011-05-08 20:35:29 +00:00
Bertrik Sikken
1ca28a4dc7 Warn about erasing dynamic playlist when loading bookmark - FS #10482 by Tuomas Airaksinen
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28176 a1c6a512-1295-4272-9138-f99709370657
2010-09-26 21:13:25 +00:00
Frank Gevaerts
f366090562 Make disabling HAVE_PITCHSCREEN actually work without breaking the build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28102 a1c6a512-1295-4272-9138-f99709370657
2010-09-17 20:28:47 +00:00
Alexander Levin
f8e7870cf5 Even more readable code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27338 a1c6a512-1295-4272-9138-f99709370657
2010-07-07 17:30:53 +00:00
Alexander Levin
2c56ac8448 Slightly rearranged lines to execute only what's really needed. No functional changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27314 a1c6a512-1295-4272-9138-f99709370657
2010-07-06 17:03:45 +00:00
Alexander Levin
7d4c0c5e7e Rename functions so that the code is easier to read
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27313 a1c6a512-1295-4272-9138-f99709370657
2010-07-06 16:53:52 +00:00
Torne Wuff
db1b823ac3 Provide the option to automatically update existing bookmark files on stop, without creating ones that don't already exist.
Idea from FS#6272, but implemented differently. If you set "Update on stop" then it will check if the bookmark file exists on stop, and if so, write a new one without prompting. If the file doesn't exist, it will do whatever the "Bookmark on stop" setting tells it to do.

This works quite well if you have an audiobook/podcast/etc folder/playlist: just bookmark it manually once and it will get bookmarked automatically after that, without creating bookmarks for regular music.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27294 a1c6a512-1295-4272-9138-f99709370657
2010-07-05 16:39:00 +00:00
Thomas Martitz
50a6ca39ad Move c/h files implementing/defining standard library stuff into a new libc directory, also standard'ify some parts of the code base (almost entirely #include fixes).
This is to a) to cleanup firmware/common and firmware/include a bit, but also b) for Rockbox as an application which should use the host system's c library and headers, separating makes it easy to exclude our files from the build.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25850 a1c6a512-1295-4272-9138-f99709370657
2010-05-06 21:04:40 +00:00
Thomas Martitz
0a1d7c28b7 Make open() posix compliant api-wise. A few calls (those with O_CREAT) need the additional optional mode parameter so add it. Impact for the core is almost zero, as open() is a wrapper macro for the real open function which doesn't take the variable parameter.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25844 a1c6a512-1295-4272-9138-f99709370657
2010-05-06 17:35:13 +00:00
Jeffrey Goode
bbbf5290a5 Bug fix from r25577. Oops.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25582 a1c6a512-1295-4272-9138-f99709370657
2010-04-11 02:32:58 +00:00
Jeffrey Goode
e2eff494a3 Fix yellow: pointer cast
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25578 a1c6a512-1295-4272-9138-f99709370657
2010-04-10 21:53:55 +00:00
Jeffrey Goode
4f3f7dd856 Fix bookmarks for hwcodec targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25577 a1c6a512-1295-4272-9138-f99709370657
2010-04-10 21:41:01 +00:00
Jeffrey Goode
55064f7b7d New bookmarks contain pitch and speed info. Old bookmarks still work, behavior unchanged.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25576 a1c6a512-1295-4272-9138-f99709370657
2010-04-10 21:17:09 +00:00
Jeffrey Goode
bec9232857 Another small bookmark.c revision, no functional change, saves bin size
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25503 a1c6a512-1295-4272-9138-f99709370657
2010-04-06 22:49:06 +00:00
Jeffrey Goode
b2ba11201f Bookmark.c cleanup, still no functional changes... yet
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25502 a1c6a512-1295-4272-9138-f99709370657
2010-04-06 21:49:33 +00:00
Jeffrey Goode
7209c5d95c Restructure some bookmarking code, preparatory to adding version info to bookmarks. Saves some bin size as a bonus. No functional changes yet.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25494 a1c6a512-1295-4272-9138-f99709370657
2010-04-05 20:53:04 +00:00
Torne Wuff
05ace8e095 Fix "bookmark on stop: ask" when idle poweroff triggers.
Previously, the prompt would come up during poweroff, and then if the user did not respond, the shutdown timeout would be hit and a hard poweroff would happen, which is bad. Now it just assumes you don't want a bookmark.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25376 a1c6a512-1295-4272-9138-f99709370657
2010-03-28 23:27:49 +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
Jonathan Gordon
2565389402 futile attempt to keep the ondioSP rombox working. This will almost certainly be the last release with it. (The backdrop API is chaning very soon after release so this is no big deal)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24340 a1c6a512-1295-4272-9138-f99709370657
2010-01-27 06:47:56 +00:00
Jonathan Gordon
4e89025935 get rid of the filename in the delete bookmark confirmation as its not really helpful
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24023 a1c6a512-1295-4272-9138-f99709370657
2009-12-16 08:38:27 +00:00
Jonathan Gordon
b9aabcb1a4 Fix FS#9198 - make the delete bookmark option confirm the action
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24021 a1c6a512-1295-4272-9138-f99709370657
2009-12-16 08:18:40 +00:00
Maurus Cuelenaere
d7d3bc248f Move strip_volume() to filefuncs.c and set properties.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23767 a1c6a512-1295-4272-9138-f99709370657
2009-11-26 22:34:08 +00:00
Nils Wallménius
3200d04d75 Make the formatter functions used by the settings return a pointer to avoid usless copying of lang strings, this brought with it a long chain of const correctness and a few random cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22440 a1c6a512-1295-4272-9138-f99709370657
2009-08-20 16:47:44 +00:00
Thomas Martitz
4764ee04c9 Add backdrop functions to the multiscreen api and add a enum backdrop_type parameter for different backdrops (main, wps), symplifying calls and removing dozens of #ifdefs (stubs added for non-backdrop displays that can't do backdrops).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22176 a1c6a512-1295-4272-9138-f99709370657
2009-08-06 00:14:40 +00:00
Nils Wallménius
3d4701a6e4 FS#10080
* Move strncpy() from core to the pluginlib
* Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins
* Drop strncpy() from the codec api as no codec used it
* Bump codec and plugin api versions


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
2009-07-14 13:57:45 +00:00
Bertrik Sikken
09085a30f6 Remove unneeded #include "backdrop.h"
Remove unneeded #include "statusbar.h"


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20891 a1c6a512-1295-4272-9138-f99709370657
2009-05-09 18:09:14 +00:00
Magnus Holmgren
30f3855078 Fix FS#9980: Bookmarking didn't work in the root of a volume (e.g., an SD card).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20236 a1c6a512-1295-4272-9138-f99709370657
2009-03-08 13:57:10 +00:00
Jonathan Gordon
e385ee18ce Decouple the statusbar drawing from the rest of the screen drawing. it is not drawn roughly 4x per second automatically.
viewport_Set_defaults() will setup the given viewport with the correct "full screen" dimensions (so start at 0,0 if statusbars are disabled or 0,8 if they are enabled.)
All screens should keep the statusbar enabled, but if you really want to ignore the user setting you can disbaled it with viewportmanager_set_statusbar(false).

This commit also includes some menu/list viewport cleanups from kugel in FS#9603


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19622 a1c6a512-1295-4272-9138-f99709370657
2008-12-31 05:59:26 +00:00
Nils Wallménius
01729e7a18 FS#9281 Rename of splash functions.
* Remove gui_splash()
* Rename gui_syncsplash() to splashf() and remove its voice 
capabilities.
* Rename the internal splash() to splash_internal() and introduce an 
externally visible splash() that handles simple splashing  without 
printf functionality e.g. splash(HZ, ID2P(LANG_FOO)); or splash(HZ, 
"foo"); if a LANG_* id is passed it will be voiced.
* Adjust all places that called gui_syncsplash() to use the correct 
variant from above.
* Export both new functions to plugins and adjust places calling 
rb->splash() to use the correct variant so that we now have naming 
consistency between the core and plugins.
* Fix one latent bug that would cause my sim to crash with the above 
changes and correct P2STR and P2ID macros, thanks to pondlife.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18282 a1c6a512-1295-4272-9138-f99709370657
2008-08-15 08:27:39 +00:00
Steve Bavin
eb66b559e1 Tiny bit of const policing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18065 a1c6a512-1295-4272-9138-f99709370657
2008-07-16 06:10:26 +00:00
Stéphane Doyon
431c895542 Workaround to allow voicing the "Create a Bookmark?" prompt
and "Bookmark Created" splash.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18061 a1c6a512-1295-4272-9138-f99709370657
2008-07-15 19:50:22 +00:00
Stéphane Doyon
bd06769ba2 Improved voice feedback in bookmark selection.
Accept FS#6240 (with minor changes).
Speak directory or playlist name in recent bookmarks. Speak shuffle status,
and filename.
Simplify the button loop by using a voice list callback.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18051 a1c6a512-1295-4272-9138-f99709370657
2008-07-15 16:10:15 +00:00
Daniel Stenberg
2acc0ac542 Updated our source code header to explicitly mention that we are GPL v2 or
later. We still need to hunt down snippets used that are not. 1324 modified
files...
http://www.rockbox.org/mail/archive/rockbox-dev-archive-2008-06/0060.shtml


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17847 a1c6a512-1295-4272-9138-f99709370657
2008-06-28 18:10:04 +00:00
Jonathan Gordon
0501fb016c total removal of gui_textarea. The only thing using the text_message struct is the yesno screen so move its definition to yesno.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17653 a1c6a512-1295-4272-9138-f99709370657
2008-05-29 11:13:46 +00:00
Bertrik Sikken
ef1ce4336f Cleaned up header files in bookmark.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17281 a1c6a512-1295-4272-9138-f99709370657
2008-04-28 16:28:21 +00:00
Bertrik Sikken
2843469876 Moved atoi declaration to stdlib.h. Deleted atoi.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17280 a1c6a512-1295-4272-9138-f99709370657
2008-04-28 16:18:04 +00:00
Nils Wallménius
33c44461e1 Const police raid, making a lot of pointers to lang strings const and removing some ugly casting
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17251 a1c6a512-1295-4272-9138-f99709370657
2008-04-26 09:30:24 +00:00
Nils Wallménius
a01996436d Use file_exists and dir_exists functions where appropriate, fix one wrong file descriptor check and one possible dir descriptor leak
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17147 a1c6a512-1295-4272-9138-f99709370657
2008-04-16 19:51:43 +00:00
Nils Wallménius
6848961aa5 Pass the buffer length to the list_get_name callback functions instead of using hardcoded MAX_PATH
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17049 a1c6a512-1295-4272-9138-f99709370657
2008-04-09 15:25:17 +00:00
Dave Chapman
d746b79317 Remove unnecessary (and incorrect) #ifdefs surrounding #include "backdrop.h", and correct remaining references to HAVE_LCD_REMOTE to HAVE_REMOTE_LCD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16873 a1c6a512-1295-4272-9138-f99709370657
2008-03-29 01:14:10 +00:00
Jonathan Gordon
5ca1539969 the menu and list now accepts a parent viewport to draw in (and the menu can be told to not show status/button bars). This lays the groundwork to fix colour problems with plugin menus (see star.c for an example.) This hopefully fixes some button bar issues as well as theme problems.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16812 a1c6a512-1295-4272-9138-f99709370657
2008-03-26 03:35:24 +00:00
Magnus Holmgren
932ef00aba When failing to auto-load a bookmark, don't show the 'Nothing to resume' message. The selected file will (hopefully) be played instead.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16364 a1c6a512-1295-4272-9138-f99709370657
2008-02-21 21:01:42 +00:00
Magnus Holmgren
04dc828c9f Better bookmark resume handling, in particular when resuming a directory. If Load Last Bookmark is set to Yes and the last bookmarked file could not be found, play the selected file instead. When selecting a bookmark for a missing file in the bookmark list, show a message that resume isn't possible (and don't play any selected file if Load Last Bookmark is set to Ask).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16267 a1c6a512-1295-4272-9138-f99709370657
2008-02-10 12:16:27 +00:00
Nils Wallménius
4acae4da03 Use the strrsplt function in one more place
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15662 a1c6a512-1295-4272-9138-f99709370657
2007-11-18 14:12:01 +00:00