Commit graph

148 commits

Author SHA1 Message Date
Björn Stenberg
b1b8bd4dd1 Moved on_screen, f2_screen, f3_screen and handle_usb (renamed usb_screen) to a new file: screens.c.
typedef Menu replaced with a bool.
All code now calls usb_screen() for usb handling.
Nearly all code now deals with USB connect/disconnect properly.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2401 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 17:22:12 +00:00
Björn Stenberg
3163aa150b Quickscreens now stay up if you release the F-key before pressing a combination key.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2382 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 08:37:58 +00:00
Linus Nielsen Feltzing
f077710b86 New mpeg_status() function replaces mpeg_is_playing()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2379 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 07:49:16 +00:00
Linus Nielsen Feltzing
1a07eef167 Key unlocking was badly handled
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2378 a1c6a512-1295-4272-9138-f99709370657
2002-09-24 05:48:58 +00:00
Björn Stenberg
505eca76e6 New language/string handling
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2327 a1c6a512-1295-4272-9138-f99709370657
2002-09-18 14:08:05 +00:00
Björn Stenberg
f269b0cf4d Exit on_screen on combination key release.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2292 a1c6a512-1295-4272-9138-f99709370657
2002-09-13 15:54:23 +00:00
Björn Stenberg
8b837a83b4 Draw on_screen as soon as any ON+key is pressed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2291 a1c6a512-1295-4272-9138-f99709370657
2002-09-13 15:27:48 +00:00
Björn Stenberg
8ce651efa0 Added pitch setting screen for recorders. Hold ON in wps to see it. Pitch range is 50-200%
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2290 a1c6a512-1295-4272-9138-f99709370657
2002-09-13 13:14:06 +00:00
Daniel Stenberg
93b231c693 Greg Haerr's new loadable font. No more #ifdef font-style, removed old
propfont and loadable font code. New font file format.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2269 a1c6a512-1295-4272-9138-f99709370657
2002-09-12 13:33:59 +00:00
Björn Stenberg
889197dbf5 Added tracknum and playlist to id3 browser (Magnus Holmgren). Enabled id3 browser on recorder.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2249 a1c6a512-1295-4272-9138-f99709370657
2002-09-09 23:18:44 +00:00
Eric Linenberg
ecca123dd2 Hardeep's browse current file patch. When hitting stop while playing, you will be on the current song, also this is configurable
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2239 a1c6a512-1295-4272-9138-f99709370657
2002-09-09 14:25:39 +00:00
Linus Nielsen Feltzing
3ec0357992 Filters out Stop events from the main menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2195 a1c6a512-1295-4272-9138-f99709370657
2002-09-06 05:33:57 +00:00
Linus Nielsen Feltzing
b19d80992c BUTTON_NONE broke the last_button filter
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2181 a1c6a512-1295-4272-9138-f99709370657
2002-09-05 05:28:15 +00:00
Daniel Stenberg
db6242c719 make the RIGHT button release work again
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2171 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 11:23:15 +00:00
Linus Nielsen Feltzing
18a2dc3eaa Fixed the disappearing shuffle text
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2168 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 05:47:09 +00:00
Justin Heiner
ab21668ae5 re-enabled the lastbutton event for recorder only.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2167 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 05:32:26 +00:00
Eric Linenberg
7eb27113c5 Nate Nystrom's FF/RW min speed patch
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2161 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 03:38:37 +00:00
Justin Heiner
ba349223bf wps-display.c
* Made 'Remaining Time' count correctly when doing FF/REW.
    * Fixed bug in player_progressbar that caused Illegal Instruction
      if the FF/Play went past the end of the song.
wps.c
    * Removed 'if(lastbutton!=BUTTON_LEFT)' from track changes.
      It was causing tracks to not change unless button was pressed
      numerous times quickly :-)
    * For player, changed BUTTON_STOP to BUTTON_STOP | BUTTON_REL.
      Since stop is also the key to turn the device off, we don't want
      it to go to the dir browser unless the stop button is released.
settings_menu.c
    * Changed the minimum disk spindown time to 3 seconds, due to
      reported problems if set below that.
makefile.vc6
    * Fixed the VC makefile to work with both Recorder & Player again.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2159 a1c6a512-1295-4272-9138-f99709370657
2002-09-04 01:51:09 +00:00
Björn Stenberg
0ad2010865 Added dir filter toggle (mp3/m3u) to F2 quick-set screen.
Added UpArrow and DownArrow icons.
Simplified dir reload handling in tree.c


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2158 a1c6a512-1295-4272-9138-f99709370657
2002-09-03 20:47:23 +00:00
Björn Stenberg
abe11fd910 Added quick-set screens to F2 (play modes) and F3 (screen settings) in dir browser and wps. Fixed minor propfont issues in lcd.c. Exported icons outside of icons.c
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2154 a1c6a512-1295-4272-9138-f99709370657
2002-09-03 15:58:47 +00:00
Björn Stenberg
a3ea73782f Ignore prev/next up unless last button was down
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2152 a1c6a512-1295-4272-9138-f99709370657
2002-09-03 11:25:45 +00:00
Björn Stenberg
40d866bd9e Fixed build errors
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2113 a1c6a512-1295-4272-9138-f99709370657
2002-09-01 20:08:08 +00:00
Björn Stenberg
26964fd957 Merged Magnus Holmgren's wps.config code.
Moved wps.config from root to /.rockbox dir.
Removed WPS display setting.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2111 a1c6a512-1295-4272-9138-f99709370657
2002-09-01 19:50:45 +00:00
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