Commit graph

44 commits

Author SHA1 Message Date
Daniel Stenberg
71a07bebe6 modified the playlist system slightly:
playlist_peek() returns info relative the current index
playlist_next() advances the index back or forth

(this breaks the build, mpeg fixes are pending)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2022 a1c6a512-1295-4272-9138-f99709370657
2002-08-28 09:22:44 +00:00
Hardeep Sidhu
f8c87e6c50 When toggling shuffle from on to off while a playlist is playing, update the current playlist index to the new index of the current song
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1977 a1c6a512-1295-4272-9138-f99709370657
2002-08-26 08:25:52 +00:00
Björn Stenberg
3df58d30e1 Removed typedef
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1958 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 20:04:31 +00:00
Daniel Stenberg
3625dedcce playlist_next() now returns NULL on excessive 'step' amounts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1940 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 07:33:35 +00:00
Daniel Stenberg
01bc8e682a play_list() is now modified to accept a playlist index that is either
meant in the unshuffled list or in the shuffled. There's an extra
parameter giving that info (which of course only makes sense when
shuffle is enabled).

This should make resume work with play-all-dir in shuffled mode.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1889 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 15:08:01 +00:00
Markus Braun
c41dcb9ae9 Now using lcd margins instead of a line offset for displaying status bar.
Needed to support fonts smaller than 8 pixels.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1823 a1c6a512-1295-4272-9138-f99709370657
2002-08-20 19:39:55 +00:00
Daniel Stenberg
5e5f1e247b When shuffle is ENABLED. And you press PLAY in a dir, the selected song
is now the first song to get played. To do this, we first remember which
song that was selected, shuffle the list and then find the selected song
in the shuffled list and play that.

This will have some interesting side effects if the song ends up for example
last in the shuffled list when we consider not always doing repeat-all as
then it'll reach the end of the playlist after one song.

We could optionally put the selected song first in the playlist and then
shuffle all the rest, as that would possibly be closer to what people will
assume it will do.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1803 a1c6a512-1295-4272-9138-f99709370657
2002-08-19 12:45:01 +00:00
Björn Stenberg
6224cdb166 Added resume. Works in dirs and playlists, shuffled or not. Resumes mid-song, but press pause on players before you shutdown so they get a chance to store the position on disk. Recorders use RTC ram. Todo: Time display is wrong after mid-track resume and ffd/rew is not handled.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1787 a1c6a512-1295-4272-9138-f99709370657
2002-08-16 14:41:47 +00:00
Linus Nielsen Feltzing
5917e8157a Now we can have up to 400 files in a directory
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1761 a1c6a512-1295-4272-9138-f99709370657
2002-08-15 12:28:52 +00:00
Björn Stenberg
ebb14ca5f9 Gained about 128 KB buffer space by removing malloc() and the heap
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1726 a1c6a512-1295-4272-9138-f99709370657
2002-08-13 23:13:01 +00:00
Björn Stenberg
e33d66a3ac Tell user when limits are reached
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1692 a1c6a512-1295-4272-9138-f99709370657
2002-08-12 22:52:19 +00:00
Björn Stenberg
a2f9fb6a33 Support double negative wrap (with a half nelson)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1632 a1c6a512-1295-4272-9138-f99709370657
2002-08-09 08:54:46 +00:00
Björn Stenberg
523c51a944 Allow reverse playlist wrap in repeat mode
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1626 a1c6a512-1295-4272-9138-f99709370657
2002-08-08 21:12:09 +00:00
Björn Stenberg
514a3fbbbe Prevent negative playlist.index
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1623 a1c6a512-1295-4272-9138-f99709370657
2002-08-08 19:10:09 +00:00
Björn Stenberg
d76116a211 Fix for double-slash fix
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1614 a1c6a512-1295-4272-9138-f99709370657
2002-08-08 13:58:53 +00:00
Linus Nielsen Feltzing
1cbe4c2e05 Removed the extra slash between the dir and filename for relative paths
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1608 a1c6a512-1295-4272-9138-f99709370657
2002-08-08 10:29:14 +00:00
Markus Braun
de8fbf00a8 Added status bar to file browser and wps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1582 a1c6a512-1295-4272-9138-f99709370657
2002-08-07 10:35:26 +00:00
Linus Nielsen Feltzing
8abcf1bd20 Changed playlist API again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1575 a1c6a512-1295-4272-9138-f99709370657
2002-08-07 06:04:24 +00:00
Linus Nielsen Feltzing
d8cc285034 RAM-based playlists added
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1559 a1c6a512-1295-4272-9138-f99709370657
2002-08-06 13:09:48 +00:00
Daniel Stenberg
360ae3ebdc Magnus Holmgren's fix that now enables us to toggle shuffle on/off from the
menu and it'll "take effect" immediately when needing to reload the playlist.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1526 a1c6a512-1295-4272-9138-f99709370657
2002-08-02 13:20:03 +00:00
Daniel Stenberg
af6ceba2a3 support for relative paths in playlists by Brian King <brking@charter.net>
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1506 a1c6a512-1295-4272-9138-f99709370657
2002-08-01 11:37:26 +00:00
Linus Nielsen Feltzing
6f75d1739f Slightly improved shuffle algorithm. Patch by Hardeep Sidhu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1397 a1c6a512-1295-4272-9138-f99709370657
2002-07-22 15:36:39 +00:00
Linus Nielsen Feltzing
c04f2ac9fd Absolute playlists with backslashes now work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1392 a1c6a512-1295-4272-9138-f99709370657
2002-07-20 22:47:25 +00:00
Björn Stenberg
529e166888 New vastly improved random algorithm: Mersenne Twister
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1377 a1c6a512-1295-4272-9138-f99709370657
2002-07-17 23:07:45 +00:00
Linus Nielsen Feltzing
6b91b7ea57 Relative path playlist patch by Mat Pritchard
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1342 a1c6a512-1295-4272-9138-f99709370657
2002-07-05 12:48:17 +00:00
Björn Stenberg
9fbdae59f8 Now uses global_settings.playlist_shuffle
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1233 a1c6a512-1295-4272-9138-f99709370657
2002-06-27 10:10:30 +00:00
Robert Hak
c0d8847f3c account for white space at the end of a filename
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1225 a1c6a512-1295-4272-9138-f99709370657
2002-06-27 08:20:09 +00:00
Björn Stenberg
a72f95c2ba Added next/previous track
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1211 a1c6a512-1295-4272-9138-f99709370657
2002-06-26 23:25:03 +00:00
Daniel Stenberg
3a36af9a22 no time.h, no time() not even in simulators
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1040 a1c6a512-1295-4272-9138-f99709370657
2002-06-17 13:34:53 +00:00
Björn Stenberg
fc2bb6cd20 Made playlist shuffle an option instead of an action
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1031 a1c6a512-1295-4272-9138-f99709370657
2002-06-17 10:36:42 +00:00
Björn Stenberg
5a8a5b54f5 Added backslash and drive letter support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1029 a1c6a512-1295-4272-9138-f99709370657
2002-06-17 10:17:50 +00:00
Daniel Stenberg
4f58f6197d the playlist loader now ignores lines that start with # as they are meant
to be "comments" and other secret magic stuff added by winamp etc


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1016 a1c6a512-1295-4272-9138-f99709370657
2002-06-15 14:31:01 +00:00
Daniel Stenberg
881d226339 allow CRLF or LF or in fact just CR too as line separators
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@990 a1c6a512-1295-4272-9138-f99709370657
2002-06-13 23:06:30 +00:00
Björn Stenberg
3505278aa5 Cosmetic change to playlist loader progress display
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@988 a1c6a512-1295-4272-9138-f99709370657
2002-06-13 21:27:42 +00:00
Björn Stenberg
4f00450f76 Loading playlists using 512 byte buffer. Added feedback display during load.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@987 a1c6a512-1295-4272-9138-f99709370657
2002-06-13 15:16:41 +00:00
Björn Stenberg
aa26b5cbe3 Added playlist shuffle menu option
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@986 a1c6a512-1295-4272-9138-f99709370657
2002-06-13 13:53:22 +00:00
Daniel Stenberg
7daaa6111f uh, make sure we start with a slash when playing songs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@967 a1c6a512-1295-4272-9138-f99709370657
2002-06-12 07:09:33 +00:00
Daniel Stenberg
c7c3d5e2ab fix multiple slash problems
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@965 a1c6a512-1295-4272-9138-f99709370657
2002-06-12 07:07:45 +00:00
Robert Hak
f564c9ac9a we now handle playlists in a block of 255 bytes instead of a single byte at a time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@947 a1c6a512-1295-4272-9138-f99709370657
2002-06-11 07:33:51 +00:00
Robert Hak
06b4e7f8bc we now handle playlists in a block of 255 bytes instead of a single byte at a time
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@946 a1c6a512-1295-4272-9138-f99709370657
2002-06-11 07:30:31 +00:00
Linus Nielsen Feltzing
b97f032464 Added leading slash to the mp3 file name
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@927 a1c6a512-1295-4272-9138-f99709370657
2002-06-10 09:02:13 +00:00
Daniel Stenberg
4ea404082d removed two compiler warnings, made the rand functions static
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@918 a1c6a512-1295-4272-9138-f99709370657
2002-06-07 14:48:06 +00:00
Daniel Stenberg
d4c9173888 added some stupid faked random functions too, to build on target
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@894 a1c6a512-1295-4272-9138-f99709370657
2002-06-04 21:50:45 +00:00
Daniel Stenberg
4d1fb48494 Moved playlist code here from the firmware directory, also adjusted it
and edited to support the mpeg thread request-style API. Believe it or not,
but this passes my basic tests for playlist funcionality.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@890 a1c6a512-1295-4272-9138-f99709370657
2002-06-04 21:43:38 +00:00