summaryrefslogtreecommitdiffstats
path: root/apps/bookmark.c
AgeCommit message (Collapse)AuthorFilesLines
2023-10-30Fix bookmarking/reloading after saving shuffled playlistChristian Soffke1-1/+5
The resume index into the playlist file that was used for bookmarks created immediately after saving a shuffled playlist, or for reloading the saved playlist (in case "Reload After Saving" was enabled), tended to be incorrect. The playlist file effectively isn't shuffled anymore after saving it to a file, but the resume index may still have to be rotated unless playback has been stopped and resumed before bookmarking, due to indices that are shifted by first_index. Change-Id: Id335a7a71adc216989d7b415bfa48237d92fd7b0
2023-10-10Hide Bookmark menu for new dynamically generated playlistsChristian Soffke1-3/+6
The bookmark menu with the option to create a bookmark was inadvertently displayed for new dynamic playlists, that had no associated folder or playlist file on disk. (e.g. after selecting some track from the database for playback), until the playlist was modified by the user. Change-Id: I9d6809e4d03603c651459415327f28e38162ad53
2023-09-23[BugFix] bookmark.c root_dir bookmarkWilliam Wilgus1-1/+1
in some calls to generate_bookmark_file_name() len gets specified in order to not NULL terminate the buffer string unfortunately, I missed the root_dir case in g#4839 Change-Id: I24d1360bbe72e6a1b2ed3332ff5854d039d58ca5
2022-12-14wps.c cleanup gui_show_wpsWilliam Wilgus1-2/+2
remove some old cruft move a few things around clean-up flow Change-Id: I138c6cd9e2d58ef526eb686333da413819df725d
2022-12-11Eliminate skin updates in between activitiesChristian Soffke1-2/+2
1) Adds way to pop activity without refreshing the skin at the same time. Activities are sometimes popped in immediate succession, or one activity is popped before another one is pushed right away. This can lead to the UI appearing glitchy, due to an activity only appearing for a split-second, which is especially noticeable with complex skins that change the dimensions of the UI viewport depending on the current activity To fix this, prevent superfluous skin updates * when switching between: - WPS and browser - WPS and Playlist Catalogue - WPS and playlist - WPS and Settings/System/Plugins * when accessing Track Info or when displaying bookmarks using the context menu on the WPS * when switching from QuickScreen to Shortcuts Menu 2) The playlist viewer activity was pushed & popped redundantly by playlist_view. ---- NB: Behavior has remained unchanged in all instances of the code where pop_current_activity() has been replaced by pop_current_activity(ACTIVITY_REFRESH_NOW). Change-Id: I56b517b8c9dba823a9fed3a3f558d7469dcea9fd
2022-12-08[Bug Fix] bookmark.c failure to compare existing tracks and playlistWilliam Wilgus1-28/+43
the underlying global buffer fo bookmark is overwritten by the read function so instead make a hash of the playlist and track names might needa better hash but hopefully CRC32 is sufficient Change-Id: Ie25dbb62e664b804e4f858d9e0cc248fdc8c9895
2022-12-05Addendum to d3d2045Christian Soffke1-2/+0
Forgot to remove this... Change-Id: Ifc97e47bb3923554030296097ef46352dad6eff1
2022-12-05Bookmarks: Fix redraw issue in Select Bookmarks screenChristian Soffke1-0/+2
Parts of the skin weren't redrawn after deleting a bookmark. Change-Id: Id06fb95a6d3740340df989bcb9827fe3a87bb296
2022-12-04Bookmarks: Fix autoload return from bookmark selectionChristian Soffke1-9/+2
- Fix placement of parentheses from commit 780990 - Return cancel when play_bookmark fails or user declines to erase dynamic playlist after warning - Go back to Playlist Catalogue when user cancels out of screen Change-Id: Ibe8c315bdf8c6c9e696f68541b5d4d97dc0e778a
2022-11-30Bug Fix bookmark.c fix resume_info overwrittenWilliam Wilgus1-77/+125
fix a bug where when 'most recent bookmarks' was enabled the next bookmark file written would get the info from the last 'most recent' bookmark instead of the current bookmark also removed the global resume_info struct in favor of local variables added verification of the resumed track Change-Id: I10176a2e4a18da6d5c4bb5fc0ed5d7e81d803ed5
2022-11-27bookmark.c fix bookmark.c fix filename generator #2William Wilgus1-16/+21
strlcpy returns the size of the string it tried to create so we still need strlen since we know what the sizes are of the strings just check for overflow first and use strmemccpy fix bufsz on playlist_get_name() Change-Id: Iaa52f869994ca94487c19b0cf2958330db4fc786
2022-11-26bookmark.c fix off by one error in filename generatorWilliam Wilgus1-3/+10
strlcpy expects the buffer size so the name gets truncated by one character Change-Id: I05ca0fed0a65a8b200f75b9647f7bf11407777a6
2022-11-25bookmark.c remove static bookmark bufferWilliam Wilgus1-169/+210
Change-Id: Ie23760890e76177acf3700fb8eb73ca7f81f112e
2022-11-24move confirm delete prompt to misc.cWilliam Wilgus1-11/+1
Change-Id: Iadb1c7199caa5070f555eb4d329efb02e3193289
2022-11-24bookmark.c parse_bookmark remove redundant conditionalWilliam Wilgus1-10/+8
we can just use the buffer not being NULL to decide Change-Id: I233191ce16db4c18ed418794c18b8c51bb05399d
2022-11-24bookmark.c remove some global buffersWilliam Wilgus1-65/+112
refactor to allow removing some of the static buffers Change-Id: Ia3ff6ea28f35634fd8c31b023431ad53bd542085
2022-11-24bookmark.c clean-upWilliam Wilgus1-483/+478
No functional changes Change-Id: If82f3e58ca848ade2a49f31357d39de9c5ba9ece
2022-11-23misc.c open_pathfmt caller supplied bufferWilliam Wilgus1-8/+4
Amachronic raised concern about open() blocking causing a static buf to get overwritten in multiple calls its prudent to just have the caller supply the buffer to minimize stack issues later Change-Id: Iae27c7d063adb1a65688f920f6aa5c395fa5694a
2022-11-19Fix return to root after selecting items from playlist viewerChristian Soffke1-8/+12
When selecting an item, Rockbox only checked that playback was stopped before entering the viewer and went to the WPS if music had started playing afterwards, but returned to the root menu otherwise The WPS will now be displayed whenever a new item has been selected, even if audio was paused or playing before. boomark_autoload required slight adjustments to its return values, so that the WPS would not be opened after a user cancels out of the bookmark selection screen for a playlist, since it previously returned true in that case, too. Change-Id: I231ea788e2f80fdda5fe4ad4d2420450931f686f
2022-11-14replace strlcpy with strmemccpyWilliam Wilgus1-2/+2
replace applicable calls to strlcpy with calls to strmemccpy which null terminates on truncation in theory the strmemccpy calls should be slightly faster since they don't traverse the rest of the source string on truncation but I seriously doubt there is too much of that going on in the code base Change-Id: Ia0251514e36a6242bbf3f03c5e0df123aba60ed2
2022-10-05gui: Remove "enum list_wrap" from list action functionsAidan MacDonald1-2/+1
Removing the "list_wrap" argument is actually pretty easy. In practice, almost all lists are using LIST_WRAP_UNLESS_HELD behavior so we can make that the default. A couple of lists disable wraparound with LIST_WRAP_OFF; this is now achieved by setting the list "wraparound" flag to false when setting up the list. LIST_WRAP_ON was unused and is of questionable value, so it has been removed entirely. This makes list wraparound behavior a property of the list, controlled solely by the "wraparound" flag. The result is a simpler list API and implementation, without changing the behavior of any lists. Change-Id: Ib55d17519e6d92fc95ae17b84ab0aaf4233bcb5a
2021-10-21whitespace fixesChristian Soffke1-43/+43
Change-Id: I86880595b78e3cae62361c32ca57cf6f6a4ad963
2021-08-04Avoid buffer overflow when generating bookmark file nameAidan MacDonald1-7/+14
Change-Id: I14f3d83a8089d33f4e900a1d5f965e67082a07ea
2020-07-24[4/4] Remove HAVE_LCD_BITMAP, as it's now the only choice.Solomon Peachy1-6/+0
Note: I left behind lcd_bitmap in features.txt, because removing it would require considerable work in the manual and the translations. Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
2020-07-24[3/4] Completely remove HWCODEC supportSolomon Peachy1-20/+7
'swcodec' is now always set (and recording_swcodec for recording-capable units) in feature.txt so the manual and language strings don't need to all be fixed up. Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0
2020-05-18bookmark: #pragma diagnostic push/pop requires GCC >= 4.6Solomon Peachy1-1/+3
Change-Id: I7daf6acebd65dd25aa55242535e1df064f1dc260
2020-05-18bookmark: Disable -Wformat-truncation around create_bookmark()Solomon Peachy1-1/+8
GCC 7 and up complain about this false positive when -Wformat-truncation or -D_FORTIFY_SOURCE is turned on. Primarily affects simulator builds on hosts with strict defaults. Change-Id: I385b3c247775e1268b6bbd326b1afc3eb5453db7
2018-12-15FS#6323: Speech for ID3 viewer, playlist catalog and playlist viewerSolomon Peachy1-20/+26
Modified from original ticket, Taken from Igor Poretsky's tree, and further modified by myself to incorporate feedback. Change-Id: Ibc2180e52af76890b1448d23f79386fd0f88f709
2018-12-14FS11473: Add bookmarking option: one per track.Solomon Peachy1-15/+46
Modified version from ticket, taken from Igor Poretsky's tree, and further modified to incorporate feedback. Change-Id: I9284497d53a0247a51739d29fdc1db5fbbebfadc
2014-08-30Rewrite filesystem code (WIP)Michael Sevakis1-4/+4
This patch redoes the filesystem code from the FAT driver up to the clipboard code in onplay.c. Not every aspect of this is finished therefore it is still "WIP". I don't wish to do too much at once (haha!). What is left to do is get dircache back in the sim and find an implementation for the dircache indicies in the tagcache and playlist code or do something else that has the same benefit. Leaving these out for now does not make anything unusable. All the basics are done. Phone app code should probably get vetted (and app path handling just plain rewritten as environment expansions); the SDL app and Android run well. Main things addressed: 1) Thread safety: There is none right now in the trunk code. Most of what currently works is luck when multiple threads are involved or multiple descriptors to the same file are open. 2) POSIX compliance: Many of the functions behave nothing like their counterparts on a host system. This leads to inconsistent code or very different behavior from native to hosted. One huge offender was rename(). Going point by point would fill a book. 3) Actual running RAM usage: Many targets will use less RAM and less stack space (some more RAM because I upped the number of cache buffers for large memory). There's very little memory lying fallow in rarely-used areas (see 'Key core changes' below). Also, all targets may open the same number of directory streams whereas before those with less than 8MB RAM were limited to 8, not 12 implying those targets will save slightly less. 4) Performance: The test_disk plugin shows markedly improved performance, particularly in the area of (uncached) directory scanning, due partly to more optimal directory reading and to a better sector cache algorithm. Uncached times tend to be better while there is a bit of a slowdown in dircache due to it being a bit heavier of an implementation. It's not noticeable by a human as far as I can say. Key core changes: 1) Files and directories share core code and data structures. 2) The filesystem code knows which descriptors refer to same file. This ensures that changes from one stream are appropriately reflected in every open descriptor for that file (fileobj_mgr.c). 3) File and directory cache buffers are borrowed from the main sector cache. This means that when they are not in use by a file, they are not wasted, but used for the cache. Most of the time, only a few of them are needed. It also means that adding more file and directory handles is less expensive. All one must do in ensure a large enough cache to borrow from. 4) Relative path components are supported and the namespace is unified. It does not support full relative paths to an implied current directory; what is does support is use of "." and "..". Adding the former would not be very difficult. The namespace is unified in the sense that volumes may be specified several times along with relative parts, e.g.: "/<0>/foo/../../<1>/bar" :<=> "/<1>/bar". 5) Stack usage is down due to sharing of data, static allocation and less duplication of strings on the stack. This requires more serialization than I would like but since the number of threads is limited to a low number, the tradoff in favor of the stack seems reasonable. 6) Separates and heirarchicalizes (sic) the SIM and APP filesystem code. SIM path and volume handling is just like the target. Some aspects of the APP file code get more straightforward (e.g. no path hashing is needed). Dircache: Deserves its own section. Dircache is new but pays homage to the old. The old one was not compatible and so it, since it got redone, does all the stuff it always should have done such as: 1) It may be update and used at any time during the build process. No longer has one to wait for it to finish building to do basic file management (create, remove, rename, etc.). 2) It does not need to be either fully scanned or completely disabled; it can be incomplete (i.e. overfilled, missing paths), still be of benefit and be correct. 3) Handles mounting and dismounting of individual volumes which means a full rebuild is not needed just because you pop a new SD card in the slot. Now, because it reuses its freed entry data, may rebuild only that volume. 4) Much more fundamental to the file code. When it is built, it is the keeper of the master file list whether enabled or not ("disabled" is just a state of the cache). Its must always to ready to be started and bind all streams opened prior to being enabled. 5) Maintains any short filenames in OEM format which means that it does not need to be rebuilt when changing the default codepage. Miscellaneous Compatibility: 1) Update any other code that would otherwise not work such as the hotswap mounting code in various card drivers. 2) File management: Clipboard needed updating because of the behavioral changes. Still needs a little more work on some finer points. 3) Remove now-obsolete functionality such as the mutex's "no preempt" flag (which was only for the prior FAT driver). 4) struct dirinfo uses time_t rather than raw FAT directory entry time fields. I plan to follow up on genericizing everything there (i.e. no FAT attributes). 5) unicode.c needed some redoing so that the file code does not try try to load codepages during a scan, which is actually a problem with the current code. The default codepage, if any is required, is now kept in RAM separarately (bufalloced) from codepages specified to iso_decode() (which must not be bufalloced because the conversion may be done by playback threads). Brings with it some additional reusable core code: 1) Revised file functions: Reusable code that does things such as safe path concatenation and parsing without buffer limitations or data duplication. Variants that copy or alter the input path may be based off these. To do: 1) Put dircache functionality back in the sim. Treating it internally as a different kind of file system seems the best approach at this time. 2) Restore use of dircache indexes in the playlist and database or something effectively the same. Since the cache doesn't have to be complete in order to be used, not getting a hit on the cache doesn't unambiguously say if the path exists or not. Change-Id: Ia30f3082a136253e3a0eae0784e3091d138915c8 Reviewed-on: http://gerrit.rockbox.org/566 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested: Michael Sevakis <jethead71@rockbox.org>
2014-03-10Implement time-based resume and playback start.Michael Sevakis1-1/+1
This complements offset-based resume and playback start funcionality. The implementation is global on both HWCODEC and SWCODEC. Basically, if either the specified elapsed or offset are non-zero, it indicates a mid-track resume. To resume by time only, set elapsed to nonzero and offset to zero. To resume by offset only, set offset to nonzero and elapsed to zero. Which one the codec uses and which has priority is up to the codec; however, using an elapsed time covers more cases: * Codecs not able to use an offset such as VGM or other atomic formats * Starting playback at a nonzero elapsed time from a source that contains no offset, such as a cuesheet The change re-versions pretty much everything from tagcache to nvram. Change-Id: Ic7aebb24e99a03ae99585c5e236eba960d163f38 Reviewed-on: http://gerrit.rockbox.org/516 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested: Michael Sevakis <jethead71@rockbox.org>
2013-04-06bookmark: add cancelling of autoload bookmarkRichard Quirk1-4/+5
When autoload bookmark is set to "Ask", navigate to a file with bookmarks in that directory. Select the file and the bookmark list appears. Even if you chose to cancel, the track started prior to this patch. Change-Id: I453999a9bc20faae97f9cf2080ef613c602ad8e1 Reviewed-on: http://gerrit.rockbox.org/416 Reviewed-by: Jonathan Gordon <rockbox@jdgordon.info>
2012-05-09Rename HAVE_PITCHSCREEN to HAVE_PITCHCONTROLNils Wallménius1-5/+5
Also move the definition to config.h Change-Id: I36bb5020c5e06b2344292bc05e8c13ccc7a6a1ff Reviewed-on: http://gerrit.rockbox.org/234 Reviewed-by: Nils Wallménius <nils@rockbox.org>
2012-04-29Make rbcodec/dsp includes more specific.Michael Sevakis1-1/+0
Change-Id: Idb6af40df26f5b8499a40e8b98602261ef227044
2012-03-12Fix minor bookmark problems/Enhance bookmark functionsOsborne Jacobs1-54/+87
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-03Set %cs(Current Screen) to "Bookmark browser" when listing bookmarks from ↵Osborne Jacobs1-2/+6
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>
2011-08-21Bookmarking no longer need worry about inability to speak while paused on ↵Michael Sevakis1-0/+2
SWCODEC. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30336 a1c6a512-1295-4272-9138-f99709370657
2011-08-07woopsJonathan Gordon1-1/+1
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30262 a1c6a512-1295-4272-9138-f99709370657
2011-08-07%cs (current screen) changes:Jonathan Gordon1-2/+6
* 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-05-24Fix 2 'set but not used' warnings.Nils Wallménius1-4/+3
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29922 a1c6a512-1295-4272-9138-f99709370657
2011-05-08More tab fixesBertrik Sikken1-8/+8
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29840 a1c6a512-1295-4272-9138-f99709370657
2010-09-26Warn about erasing dynamic playlist when loading bookmark - FS #10482 by ↵Bertrik Sikken1-0/+2
Tuomas Airaksinen git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28176 a1c6a512-1295-4272-9138-f99709370657
2010-09-17Make disabling HAVE_PITCHSCREEN actually work without breaking the buildFrank Gevaerts1-5/+5
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28102 a1c6a512-1295-4272-9138-f99709370657
2010-07-07Even more readable codeAlexander Levin1-0/+2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27338 a1c6a512-1295-4272-9138-f99709370657
2010-07-06Slightly rearranged lines to execute only what's really needed. No ↵Alexander Levin1-3/+3
functional changes. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27314 a1c6a512-1295-4272-9138-f99709370657
2010-07-06Rename functions so that the code is easier to readAlexander Levin1-8/+8
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27313 a1c6a512-1295-4272-9138-f99709370657
2010-07-05Provide the option to automatically update existing bookmark files on stop, ↵Torne Wuff1-0/+5
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-05-06Move c/h files implementing/defining standard library stuff into a new libc ↵Thomas Martitz1-3/+3
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-06Make open() posix compliant api-wise. A few calls (those with O_CREAT) need ↵Thomas Martitz1-2/+2
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-04-11Bug fix from r25577. Oops.Jeffrey Goode1-2/+2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25582 a1c6a512-1295-4272-9138-f99709370657
generated by cgit (git 2.34.1) at 2024-04-18 06:18:34 +0000