Commit graph

125 commits

Author SHA1 Message Date
Björn Stenberg
883adb5bfc Removed busy loops.
Replaced unnecessary snprintfs.
Added plenty of whitespace.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2096 a1c6a512-1295-4272-9138-f99709370657
2002-08-31 12:49:01 +00:00
Justin Heiner
b5025a8c40 USB Related:
Consolidated some more of the USB code in the WPS.
    Have backlight turn offf when USB Connected.
menu.c:
    LINE_X was set wrong for player.
settings_menu.c / wps-display.c:
    Added 1 Line ID3+. Has progress bar & Kbps.
    Renamed some of the WPS options to be more readable.
wps.c / wps-display.c
    Fixed problem with FF/REW when 'Remaining Time' is on.
    Added %pb to the WPS mix. Player progress bar thingy.
    Thanks to whoever fixed my PLAYER_PROGRESS function :-)
    Changed how volume changes on player (works better now).
    General cleanup of Custom WPS code.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2091 a1c6a512-1295-4272-9138-f99709370657
2002-08-31 04:58:35 +00:00
Markus Braun
51ca48ba0d Set lcd margins only if we return from main_menu().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2089 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 20:41:03 +00:00
Markus Braun
000c2db035 Added scrollbar to tree view and menus.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2084 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 13:49:32 +00:00
Björn Stenberg
6131a3cc0d Moved display portions of wps.c into new file: wps-display.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2079 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 11:04:41 +00:00
Mats Lidell
648bbfa1ae Bad ifdef removed. Open handles simulator filesystem.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2078 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 09:23:25 +00:00
Mats Lidell
ec0da2f1f8 Simulator reads wps config from file too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2077 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 08:50:40 +00:00
Justin Heiner
9b62c23d8f Got rid of the old WPS, and use Custom WPS as the method of WPS updating. Also working on a player progress bar (using a custom character). That is now able to be #included with -DPLAYER_PROGRESS in the apps/Makefile
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2074 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 07:11:18 +00:00
Justin Heiner
87f53249b2 Added %pr to CUSTOM_WPS to display remaining time in song.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2072 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 03:08:02 +00:00
Justin Heiner
bd1ddf6d5a update to my update
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2071 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 02:22:42 +00:00
Justin Heiner
0492d624b0 Another update to Zagor's commit
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2070 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 02:08:36 +00:00
Justin Heiner
7e11b62d19 Fixed a couple of problems with Zagor's commit, along with some of my own CUSTOM_WPS problems
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2069 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 01:34:56 +00:00
Björn Stenberg
b665c72fb4 Fixed player build
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2067 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 00:56:09 +00:00
Björn Stenberg
87a4ed5731 Refactored. States are now handled in separate functions instead of using state variables.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2064 a1c6a512-1295-4272-9138-f99709370657
2002-08-30 00:31:00 +00:00
Hardeep Sidhu
0227b96812 Don't resume when song is already paused and user selects previous
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2061 a1c6a512-1295-4272-9138-f99709370657
2002-08-29 16:20:33 +00:00
Justin Heiner
8097ee6af1 Custom WPS update - works for recorder and player now. Also updated how the WPS refreshes the screen when using Custom WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2046 a1c6a512-1295-4272-9138-f99709370657
2002-08-29 05:41:35 +00:00
Eric Linenberg
de14e53c66 update to the ff/rw options accelerate options
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2045 a1c6a512-1295-4272-9138-f99709370657
2002-08-29 04:50:39 +00:00
Eric Linenberg
65240761fb Nate Nystrom's ff/rw acceleration patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2044 a1c6a512-1295-4272-9138-f99709370657
2002-08-28 19:34:07 +00:00
Justin Heiner
7d808a83e4 Added basic handling of \r\n (ignores it) to the Custom WPS
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2043 a1c6a512-1295-4272-9138-f99709370657
2002-08-28 18:03:20 +00:00
Linus Nielsen Feltzing
ccfef0480b First attempt to use the new playlist API
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2024 a1c6a512-1295-4272-9138-f99709370657
2002-08-28 10:21:32 +00:00
Justin Heiner
415a2e76f5 Fixed a little problem coming out of the Player's ID3 info screen. You had to press menu twice to get to the menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1991 a1c6a512-1295-4272-9138-f99709370657
2002-08-27 06:32:53 +00:00
Justin Heiner
a7a46c70dd Update to CUSTOM_WPS. Now has an If/Else ability. Also updated the docs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1990 a1c6a512-1295-4272-9138-f99709370657
2002-08-27 01:05:19 +00:00
Björn Stenberg
457b8a0a67 Added configurable disk spindown. The disk will also now not spin down while you are running around in the dir browser or pressing buttons in the wps.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1987 a1c6a512-1295-4272-9138-f99709370657
2002-08-26 13:21:14 +00:00
Björn Stenberg
26a50afc8a global_settings are not for runtime state variables!
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1967 a1c6a512-1295-4272-9138-f99709370657
2002-08-24 11:13:35 +00:00
Justin Heiner
5301881adc Update to the Custom WPS. Now actually works, can be fed any string, uses %xx instead of just %x, and more! It's #define'd out in settings.h - Needs to be enabled to use it. PLAYER ONLY
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1963 a1c6a512-1295-4272-9138-f99709370657
2002-08-24 06:57:24 +00:00
Björn Stenberg
62847edbe7 Don't display wps until there is data to display (or we'll get the annoying 'end of song list' screen.)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1961 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 22:49:32 +00:00
Daniel Stenberg
c1fe36f36f prevent the "end of (song) list" getting displayed if there's an mpeg
playing or pending to get played.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1956 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 13:27:17 +00:00
Robert Hak
ad4a92eb87 stupid tabs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1947 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 11:37:40 +00:00
Robert Hak
f27fecb076 minor style fixes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1946 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 11:31:19 +00:00
Markus Braun
d58dab8dd8 restore was allwas true. Set it to false when last restore request was
handled.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1945 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 11:06:14 +00:00
Daniel Stenberg
e6261734a0 two fixes at once:
1. If the WPS is popped up but the mpeg thread can't play any song, we must
   make sure to update the screen to display the "end of playlist" thing.

2. When having reached the "end of playlist" state, pressing LEFT caused a
   crash (due to a NULL pointer being used).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1942 a1c6a512-1295-4272-9138-f99709370657
2002-08-23 08:06:39 +00:00
Justin Heiner
1a8f34bfa9 Changed CUSTOM_WPS to be a define-only feature until it is more complete. To include it, simply uncomment the #define CUSTOM_WPS line in wps.h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1924 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 14:19:47 +00:00
Daniel Stenberg
487662a67c fix file name pointer usage, clean the buffer faster, don't use extra
variable


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1921 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 07:12:45 +00:00
Justin Heiner
ad14c5b14e Flipped a line to make it work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1917 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 06:38:20 +00:00
Justin Heiner
6dd8b83507 Attempt at fixing reds
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1916 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 06:25:14 +00:00
Daniel Stenberg
11714aceab fixed compiler error
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1914 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 05:30:07 +00:00
Justin Heiner
70a203341f Added conditional Title-Artist to appease PsycoXul :-) It's bound to %h
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1913 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 04:03:57 +00:00
Justin Heiner
b10017e3e8 Added %% as an available tag to the Custom WPS. Displays % when used
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1909 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 03:02:59 +00:00
Justin Heiner
b986a5c6b7 Added ability to have a Custom WPS Display on the Player. See the commited doc for the tag specification
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1903 a1c6a512-1295-4272-9138-f99709370657
2002-08-22 02:24:14 +00:00
Justin Heiner
7dcff6d98c Changed the previous patch to restart the same song if over 2 seconds to 3 seconds. That way you can hear a bit of the song before... well, it's just better this way *grin*
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1902 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 23:24:26 +00:00
Björn Stenberg
0c2e9f21e3 Stays in pause mode after seek
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1896 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 17:38:56 +00:00
Eric Linenberg
84cf9d446c Lee Marlow's patch to restart the same song if the back button is hit in the wps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1895 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 17:34:01 +00:00
Markus Braun
a2feb8b4c8 Fix for fix
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1879 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 11:40:34 +00:00
Markus Braun
c6c848e91b Fixed wps usb bug. Before rockbox switched not to usb mode when cable was
pluged.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1870 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 11:08:49 +00:00
Markus Braun
6110c98234 Consolidated display restore code.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1836 a1c6a512-1295-4272-9138-f99709370657
2002-08-21 06:40:06 +00:00
Markus Braun
faacfea055 faster redraw of time display
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1825 a1c6a512-1295-4272-9138-f99709370657
2002-08-20 20:00:44 +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
Justin Heiner
97e4a8fbef Added draw_screen(id3) after volume change. Fixed bug in player WPS ID3 Info screen. It needed dont_go_to_menu = true and menu_button_is_down = false.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1816 a1c6a512-1295-4272-9138-f99709370657
2002-08-20 13:10:43 +00:00
Björn Stenberg
43bcd823b7 Pause now works again (I broke it with my mpeg_is_playing() fix...)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1802 a1c6a512-1295-4272-9138-f99709370657
2002-08-19 12:38:27 +00:00
Justin Heiner
c0ea4a7d1d Added Smart(tm) ID3 displaying to the new 1 Line ID3. If no ID3 is available, it will display the filename instead
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1796 a1c6a512-1295-4272-9138-f99709370657
2002-08-19 08:11:23 +00:00