Thomas Martitz
31b5c471ae
Rockbox as an application: Add an 320x240 SDL application target.
...
It still works mostly like the simulator. There's also some minor left overs from the sim, but it does not define SIMULATOR.
It installs into the current (build) dir, and you need to run it with '--root .' (because it looks for ./.rockbox and not ./simdisk/rockbox) as options. That's one of the few kludges left that should be resolved soon'ish.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27310 a1c6a512-1295-4272-9138-f99709370657
2010-07-06 15:11:56 +00:00
Rafaël Carré
3982f1e932
Simulator: build recording code
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27280 a1c6a512-1295-4272-9138-f99709370657
2010-07-04 13:37:52 +00:00
Thomas Martitz
251b62d73a
sim_icons.c is actually only for charcell display simulation.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27069 a1c6a512-1295-4272-9138-f99709370657
2010-06-22 23:22:31 +00:00
Rafaël Carré
5d236b2bfd
Generate C file / header for svn version string
...
It's now easier to force rebuild of files depending on the svn revision
version.c/version.h are generated once with new tools/genversion.sh
Changes in the VCS are still not auto detected, so you'll have to remove
builddir/version.* if you want to change the string in your binaries
APPSVERSION is now called RBVERSION and is defined in the generated
header instead of being defined by the Makefiles
appsversion is now called rbversion (the plugin api number didn't change
since old modules are still binary compatible)
Change some bootloaders to use knwon-at-buildtime RBVERSION instead of
"%s" + rbversion
You'll need to run make clean to regenerate dependencies after the
removal of apps/version.h
To build binaries with a different version string, hand-edit
tools/version.sh or tools/genversion.sh (which calls the former)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26320 a1c6a512-1295-4272-9138-f99709370657
2010-05-27 09:41:46 +00:00
Rafaël Carré
ba46c88c6f
rtc_enable_alarm() needs no return value
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26245 a1c6a512-1295-4272-9138-f99709370657
2010-05-22 00:28:26 +00:00
Thomas Martitz
6cbc701d2a
Rename sdl lcd initialization to (remote_)lcd_init_device which enables removing two #ifdef SIMULATOR and makes it happen as on target.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26137 a1c6a512-1295-4272-9138-f99709370657
2010-05-18 12:27:20 +00:00
Thomas Martitz
3d0cee8abb
- Move uisimulator/sdl/*.[ch] into the target tree, under firmware/target/hosted/sdl, uisdl.c is split up across button-sdl.c and system-sdl.c.
...
- Refactor the program startup. main() is now in main.c like on target, and the implicit application thread will now act as our main thread (previously a separate one was created for this in thread initialization).
This is part of Rockbox as an application and is the first step to make an application port from the uisimulator. In a further step the sim bits from the sdl build will be separated out.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26065 a1c6a512-1295-4272-9138-f99709370657
2010-05-15 21:02:47 +00:00
Jonathan Gordon
a5d8d21596
fix the last of the reds, and make RDS tags actually work (and add them to the hardcoded radio skin)
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25966 a1c6a512-1295-4272-9138-f99709370657
2010-05-12 11:44:09 +00:00
Thomas Martitz
e919b5d5b9
Fix disastrous variable shadowing, change casts to unsigned in (cygwin doesn't like mode_t there, and unsigned int should be equally correct) and check the correct bitmask in sim_open().
...
Should repair filesystem accesses on the sim.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25881 a1c6a512-1295-4272-9138-f99709370657
2010-05-07 16:56:40 +00:00
Thomas Martitz
55e4fe73cc
Fix the remaining reds.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25858 a1c6a512-1295-4272-9138-f99709370657
2010-05-06 22:33:57 +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
Thomas Martitz
c61e89c0ed
Make creat() posix compliant API-wise. Shouldn't affect the core as it's wrapped via a static inline.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25843 a1c6a512-1295-4272-9138-f99709370657
2010-05-06 17:35:04 +00:00
Andree Buschmann
b6c12a129e
Submit FS#11065. Introduce a new system setting for en-/disabling the Line-out. For now only implemented on iPod Video. This allows to save power if the user does not use the player's Line-out. On iPod 5G the saving is ~0.5 mA.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25257 a1c6a512-1295-4272-9138-f99709370657
2010-03-20 15:02:29 +00:00
Jens Arnold
181e0e0878
Switch to using statvfs for simulated fat_size(). This makes io.c build on opensolaris, and also removes special ifdefing for freebsd and OS X.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25256 a1c6a512-1295-4272-9138-f99709370657
2010-03-20 12:45:54 +00:00
Amaury Pouly
e9b3c90622
FS#10954: fix rename under simulator by Alex Bennee
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24443 a1c6a512-1295-4272-9138-f99709370657
2010-02-01 22:45:27 +00:00
Thomas Martitz
b5e1a1cc59
Fix red, moved around a bit to much.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24291 a1c6a512-1295-4272-9138-f99709370657
2010-01-19 22:56:37 +00:00
Thomas Martitz
6915340f2d
Fix FS#10867 and a few more potential issues by imitate target scrollwheel behavior more (although that behavior is suboptimal imo). Also, default for maximum backlight brightness in the sim and move stuff into sim.h.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24289 a1c6a512-1295-4272-9138-f99709370657
2010-01-19 22:07:28 +00:00
Andree Buschmann
5cebdcd06b
More tabs removed
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24157 a1c6a512-1295-4272-9138-f99709370657
2010-01-03 11:12:31 +00:00
Bertrik Sikken
5c4ef78cc9
Simplify some expressions using the ? operator
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24136 a1c6a512-1295-4272-9138-f99709370657
2010-01-01 22:47:25 +00:00
Maurus Cuelenaere
5d96c3ba71
Enable backlight brightness in simulator
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24042 a1c6a512-1295-4272-9138-f99709370657
2009-12-17 13:44:09 +00:00
Michael Chicoine
ae22ef13ed
UISimulator - prevent multiple definition of usb_inserted when USB_NONE is defined
...
This fixes simulator build errors on mini2440
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23723 a1c6a512-1295-4272-9138-f99709370657
2009-11-23 17:43:42 +00:00
Thomas Martitz
d85c3ec410
Convert lcd_activation callbacks to use the event system to allow for multiple parallel callbacks (for custom statusbar).
...
Increase maximum event count as we need more (I actually had a report about it during custom statusbar testing).
Removed corresponding functions from the core and plugin api. Bump min version and sort.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23302 a1c6a512-1295-4272-9138-f99709370657
2009-10-20 21:54:59 +00:00
Tomer Shalev
a39be4b307
Fix red: Invert buttons in RTL mode
...
- Revert renaming of button_set_flip()
- Moved rtl flipping logic to apps/actions.c as a static function
- Joined rtl_button_flip_needed() and button_flip_horizontally()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22962 a1c6a512-1295-4272-9138-f99709370657
2009-10-05 17:53:45 +00:00
Tomer Shalev
f7bd7252e1
Invert buttons in RTL mode
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22961 a1c6a512-1295-4272-9138-f99709370657
2009-10-05 17:17:30 +00:00
Nils Wallménius
c8b87d76eb
FS#10569 RTC driver cleanup
...
Change the RTC drivers so that the rtc_(read|write)_datetime functions now deal directly with the tm struct instead of passing a string of bcd digits to/from (set|get)_time .
This simplifies drivers for rtc's that do not use a bcd representation internally and cleans up some target specific code and #ifdefs in generic code. Implement simple stubs for the sim to avoid #ifdefing for that too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22839 a1c6a512-1295-4272-9138-f99709370657
2009-09-26 14:58:32 +00:00
Nils Wallménius
4f87976677
Slight cleanup in lcd.h: kill fixme and remove useless include, add some includes elsewhere and add a stub for sims instead of ifdef
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22431 a1c6a512-1295-4272-9138-f99709370657
2009-08-19 21:48:17 +00:00
Robert Kukla
275a30092e
initial commit of remote support for m:robe 100 courtesy of lowlight; simulator support including small fixes for the m:robe 500
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22053 a1c6a512-1295-4272-9138-f99709370657
2009-07-26 14:26:14 +00:00
Thomas Martitz
b2b3f39403
Remove an #ifdef SIMULATOR in favor of using a stub
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20853 a1c6a512-1295-4272-9138-f99709370657
2009-05-05 08:43:32 +00:00
Thomas Martitz
a7f4e1f1c5
Simulate lcd_enable and lcd_sleep in the simulator. Therefore, turn backlight-sim.h into a .c too.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20829 a1c6a512-1295-4272-9138-f99709370657
2009-04-29 22:24:40 +00:00
Thomas Martitz
13477a0d0f
Set keywords and eol-style properties for the new backlight-sim.h.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20797 a1c6a512-1295-4272-9138-f99709370657
2009-04-26 02:32:37 +00:00
Thomas Martitz
0a5beba823
Move the sim stubs into a seperate file to clean backlight.c up a bit.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20796 a1c6a512-1295-4272-9138-f99709370657
2009-04-26 02:27:11 +00:00
Thomas Martitz
7e7d8ebfef
Actually do the renaming of the stub.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20334 a1c6a512-1295-4272-9138-f99709370657
2009-03-17 03:45:55 +00:00
Thomas Martitz
4ed387d603
Fix reds and yellows (hopefully). Some targets apparently didn't properly #ifdef lcd_enable and lcd_sleep code out, so that it got partly active in the bootloader; rename the ui simulator stub fixes most reds; for the clip: move the hook code into lcd-1bit-vert.c which should fix the bootloader red.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20333 a1c6a512-1295-4272-9138-f99709370657
2009-03-17 03:36:36 +00:00
Steve Bavin
b61f0c6884
FS#9964 take 2. Including the whole patch is a good idea.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20133 a1c6a512-1295-4272-9138-f99709370657
2009-02-27 21:25:17 +00:00
Steve Bavin
6eea66fbc1
FS#9964 - Fix simulator file i/o when the --root option is used.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20132 a1c6a512-1295-4272-9138-f99709370657
2009-02-27 21:15:52 +00:00
Tom Ross
353ebd0967
Small bit from my GSoC work: Unify the way the simulator accesses voice strings. In the future this will allow plugin menus to be translated and voiced.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20125 a1c6a512-1295-4272-9138-f99709370657
2009-02-27 07:57:29 +00:00
Jens Arnold
3e67e3b1f0
Add a rockbox kernel thread for simulator specific tasks, and use that for calling the screendump function(s). Fixes screendump in simulators for backlight-less targets (Ondio), and reduces mixing of unrelated functionality a bit (screendump was called from backlight thread, triggered by a sim-only system wide event).
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20065 a1c6a512-1295-4272-9138-f99709370657
2009-02-20 17:13:08 +00:00
Björn Stenberg
ff498519d0
Red build fix.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19744 a1c6a512-1295-4272-9138-f99709370657
2009-01-10 21:38:56 +00:00
Michael Sevakis
faa01e9e94
Fix yellow. Don't know how I missed that testing sim build. :\
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19719 a1c6a512-1295-4272-9138-f99709370657
2009-01-08 11:27:46 +00:00
Michael Sevakis
33a7f3a6cf
Allow sims to shut down normally from panic code.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19718 a1c6a512-1295-4272-9138-f99709370657
2009-01-08 11:08:22 +00:00
Michael Sevakis
4ed78f5c72
Clean up panicf and introduce system_exception_wait to do further target tasks and wait for a button when an unrecoverable error has occurred (panic, UIE, etc.). Returning from that function should reboot or don't return from it. Move UIE and __div0 for ARM to its own file.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19716 a1c6a512-1295-4272-9138-f99709370657
2009-01-08 10:15:32 +00:00
Nils Wallménius
f501cda42d
Fix remaining red.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19661 a1c6a512-1295-4272-9138-f99709370657
2009-01-03 15:55:20 +00:00
Michael Sevakis
3157e13956
Simplify powermgmt thread loops so it calls functions turn (no more power_thread_sleep). Do other target-friendly simplifications, generic battery switch handling and split sim-specific code. Whoever can, please verify charging on the Archos Recorder (due to change in the charger duty cycle code).
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19579 a1c6a512-1295-4272-9138-f99709370657
2008-12-24 16:58:41 +00:00
Björn Stenberg
ee46a3d88e
Moved database builder into a separate directory, and gave it its' own Makefile. Now it compiles cleanly and builds a database if ran in root of music tree.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19448 a1c6a512-1295-4272-9138-f99709370657
2008-12-15 23:42:19 +00:00
Jonathan Gordon
2f1892a267
stop printing "storage_sleep()" in the sim output
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19323 a1c6a512-1295-4272-9138-f99709370657
2008-12-04 09:09:49 +00:00
Michael Sevakis
add677fca8
Fix some red. The stubs in bootloaders are giving some trouble.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19316 a1c6a512-1295-4272-9138-f99709370657
2008-12-03 20:43:10 +00:00
Michael Sevakis
58eb784a5d
Straighten out some powermanagement stuff. Give target complete control over how power inputs are sensed. Clean SIMULATOR stuff out of target files. Get rid of USB charging option on targets that don't support it or don't implement it yet. Menu string remains to avoid language incompatibility but should be removed on next cleanup for targets not using it (notice in english.lang). global_settings becomes incompatible for some builds and so plugin API version is incremented.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19315 a1c6a512-1295-4272-9138-f99709370657
2008-12-03 19:54:25 +00:00
Björn Stenberg
819378bf9d
Renamed simulator disk directory from 'archos' to 'simdisk'.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19204 a1c6a512-1295-4272-9138-f99709370657
2008-11-24 20:32:57 +00:00
Frank Gevaerts
99d39f5c3a
put stubs in the proper place
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18978 a1c6a512-1295-4272-9138-f99709370657
2008-11-02 02:19:39 +00:00
Bertrik Sikken
f4d4a6ab60
Implement FS#8947 - Add a stub in the simulator for ata_disk_is_active. This make it possible to clean up some #ifdef SIMULATOR macros.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17927 a1c6a512-1295-4272-9138-f99709370657
2008-07-03 13:37:57 +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
Michael Giacomelli
3d30be8557
lcd-common.h hasn't contained code in nearly 6 years.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17722 a1c6a512-1295-4272-9138-f99709370657
2008-06-14 23:10:47 +00:00
Michael Sevakis
3b730a280d
Fix red while keeping menu item.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17658 a1c6a512-1295-4272-9138-f99709370657
2008-05-29 21:53:49 +00:00
Nicolas Pennequin
357ffb3c46
Convert the whole codebase to UTF-8, except docs/COMMITTERS and tools/creative.c, which need checking.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17369 a1c6a512-1295-4272-9138-f99709370657
2008-05-05 10:32:46 +00:00
Jens Arnold
2bf4178018
Make mpegplayer sleep the disk after buffering to save battery. * Add a simulator stub for ata_sleep(), and un-ifdef most calls to it.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17096 a1c6a512-1295-4272-9138-f99709370657
2008-04-13 12:24:47 +00:00
Steve Bavin
ac313abe87
Best use C, not C++
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17021 a1c6a512-1295-4272-9138-f99709370657
2008-04-07 17:27:56 +00:00
Steve Bavin
799e9489ca
Remove some more simulator debugging output.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17019 a1c6a512-1295-4272-9138-f99709370657
2008-04-07 17:19:53 +00:00
Steve Bavin
135cc757bd
Revert my earlier const madness, we'll keep the parameter lists simple.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16863 a1c6a512-1295-4272-9138-f99709370657
2008-03-28 12:51:33 +00:00
Steve Bavin
c9df8fd87b
The const police raid playback.c, should be no change to behaviour.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16860 a1c6a512-1295-4272-9138-f99709370657
2008-03-28 11:24:24 +00:00
Jens Arnold
b88c7d076d
The blit functions shouldn't exist for the simulator.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16777 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 01:00:42 +00:00
Jens Arnold
c84e345e6e
Oops, fix red.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16776 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 00:45:03 +00:00
Jens Arnold
68a21689ae
Consistent naming scheme the various blit functions. * Removed lcd_blit_mono() for colour targets. Plugin API became incompatible, so sort, clean up & bump. * Implemented lcd_blit_mono() for M3.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16775 a1c6a512-1295-4272-9138-f99709370657
2008-03-24 00:35:53 +00:00
Michael Sevakis
6a05883239
Simulate the effects of sector caching a bit. Bypass I/O yield if a byte counter hasn't reached a certain threshold. Can be dialed-in by changing a #define.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15871 a1c6a512-1295-4272-9138-f99709370657
2007-12-03 15:33:12 +00:00
Michael Sevakis
a4d19b7e89
Simplify the uisimulator I/O routine and let the rockbox thread calling the functions be the background thread. Should speed things up too and lose none of the advantanges of background I/O.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15870 a1c6a512-1295-4272-9138-f99709370657
2007-12-03 14:01:12 +00:00
Steve Bavin
f87eb608a8
Code police; trailing spaces mainly.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15527 a1c6a512-1295-4272-9138-f99709370657
2007-11-08 12:11:34 +00:00
Steve Bavin
9e05cc537b
Add --root option to allow overriding of simulator root menu.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15526 a1c6a512-1295-4272-9138-f99709370657
2007-11-08 10:15:44 +00:00
Jonathan Gordon
c14430a9c1
compile talk.c on hwcodec sim. it wont actually talk though
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15512 a1c6a512-1295-4272-9138-f99709370657
2007-11-07 09:28:07 +00:00
Nicolas Pennequin
c70671b652
Fix sims: sim_codec_load_ram() needed an update
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15411 a1c6a512-1295-4272-9138-f99709370657
2007-11-02 17:43:37 +00:00
Steve Bavin
32a9575130
FS#7994 - Rename talk.c API, make talk_disable() affect all talking (not just menus), hopefully save some space.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15206 a1c6a512-1295-4272-9138-f99709370657
2007-10-19 15:31:42 +00:00
Dave Chapman
443ccb6031
Remove some dead code
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15171 a1c6a512-1295-4272-9138-f99709370657
2007-10-17 18:23:25 +00:00
Jonathan Gordon
c9d1ab7218
Fixes a problem where the sim would try to start the WPS on HAVE_RTC_ALARM sims (FS#7862 with a small addition by me)
...
use the --alarm argument if you do want to simulate this behaviour
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15094 a1c6a512-1295-4272-9138-f99709370657
2007-10-13 12:07:59 +00:00
Jonas Häggqvist
b24631c07f
Fix crosscompiling the uisim with mingw32 by adding a definition of CLOSE
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15047 a1c6a512-1295-4272-9138-f99709370657
2007-10-09 17:51:02 +00:00
Nicolas Pennequin
ef9abe4385
Keep track of the number of opened files in the sim to enforce the same limit as on target.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15045 a1c6a512-1295-4272-9138-f99709370657
2007-10-09 15:15:00 +00:00
Jens Arnold
5128080328
FS #7752 by Catalin Patulea: Stop 'Rockbox Info' from crashing multivolume target simulators (Ondio, Sansa).
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14684 a1c6a512-1295-4272-9138-f99709370657
2007-09-13 20:53:32 +00:00
Michael Sevakis
c4a7631eb9
UISIMULATOR: Do a graceful shutdown of all threads and avoid (mostly lockup) problems caused by not worrying about states. Have rockbox objects initialized only by rockbox threads save for the main 'gui' thread which is a needed exception.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14660 a1c6a512-1295-4272-9138-f99709370657
2007-09-10 03:49:12 +00:00
Michael Sevakis
0107dfc827
UISIMULATOR: Give the host OS some needed context switching hints (which _is_ supposed to work on Linux - but I can't tell on VMWare - and does on Windows). I guess I'll know for sure soon. Give sleep() even more genuine behavior. Add some button driver sync with the rockbox threads that should have been there for some time - this is basically interrupt-like processing as any thread not in the kernel pool should be considered. Make the screendump work again by posting the request. Perhaps help out shutting down for some users but not in the way I'd prefer - to think about.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14646 a1c6a512-1295-4272-9138-f99709370657
2007-09-09 01:59:07 +00:00
Michael Sevakis
f64ebb1c1f
Sim I/O and threading that runs more like on target. Tweakable if any genuine slowness imitation is required for any one of them. One point of concern is the sim shutdown on an OS other than Linux just because terminating threads in a manner other than having the do it themselves is kind of dirty IMHO.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14639 a1c6a512-1295-4272-9138-f99709370657
2007-09-08 12:20:53 +00:00
Jens Arnold
8a177345ce
Moved archos power handling into target tree. * Tuner power handling cleaned up a bit.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14345 a1c6a512-1295-4272-9138-f99709370657
2007-08-14 22:06:23 +00:00
Nils Wallménius
f28da1a35a
Enable a lot more features for simulators and add stubs where necessary, simulators should now work with identical lng and voice files as the respective target
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14299 a1c6a512-1295-4272-9138-f99709370657
2007-08-12 19:49:03 +00:00
Nils Wallménius
ff2a93f723
Remove the 'USB' menu item from the sim system menu, press the 'u' key to display the USB screen instead, will break binary lng files and voice files for the sims only
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14269 a1c6a512-1295-4272-9138-f99709370657
2007-08-10 14:10:50 +00:00
Michael Sevakis
680afafc23
Fix all the red this time?
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13884 a1c6a512-1295-4272-9138-f99709370657
2007-07-14 13:41:59 +00:00
Michael Sevakis
7d759f6b9c
Do some planned radio interface cleanup since adding in the LV24020LP.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13880 a1c6a512-1295-4272-9138-f99709370657
2007-07-14 11:20:31 +00:00
Michael Sevakis
979c2b7c66
Add lcd_sleep stub to sim too.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13819 a1c6a512-1295-4272-9138-f99709370657
2007-07-08 13:13:25 +00:00
Steve Bavin
c0e6e20fb6
Oops. I should respect the simulator #ifdefs more.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13618 a1c6a512-1295-4272-9138-f99709370657
2007-06-11 09:04:50 +00:00
Michael Sevakis
d89eba1619
As ususual, fix the sim errors.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13574 a1c6a512-1295-4272-9138-f99709370657
2007-06-06 19:39:59 +00:00
Jens Arnold
49be3faf07
A bit more readable code. Also saves one buffer.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13222 a1c6a512-1295-4272-9138-f99709370657
2007-04-20 17:35:05 +00:00
Daniel Stenberg
f6209cc959
a little extra poke to get the sim to build
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13215 a1c6a512-1295-4272-9138-f99709370657
2007-04-20 11:58:39 +00:00
Jens Arnold
2fd7c3c828
Make the simulator work with unicode filenames on windows. This includes both file operations and console (debug) output. Note that the console window _must_ be configured to use a truetype font for proper unicode display.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13211 a1c6a512-1295-4272-9138-f99709370657
2007-04-19 20:17:24 +00:00
Peter D'Hoye
6be615615d
Fix sim crashes on long filenames. Patch by Sean Morrisey with some minor changes by me. Fixes FS #6009
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13138 a1c6a512-1295-4272-9138-f99709370657
2007-04-12 22:38:54 +00:00
Jens Arnold
d6cb716697
Declare struct sim_dirent the same way as rockbox core's struct dirent. Fixes file time reading for 64 bit sims.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13053 a1c6a512-1295-4272-9138-f99709370657
2007-04-07 00:14:16 +00:00
Peter D'Hoye
f0ed594aaa
Fix red
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13052 a1c6a512-1295-4272-9138-f99709370657
2007-04-06 23:54:21 +00:00
Peter D'Hoye
832e0dfb16
Fix file date and time reading in the simulator (used by the properties plugin)
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13051 a1c6a512-1295-4272-9138-f99709370657
2007-04-06 23:33:33 +00:00
Jens Arnold
323d75d25f
It's not necessary (anymore?) to map lcd_icon() to sim_lcd_icon() for the simulator. * Removed a stray lcd_icon() call from usb handling.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13006 a1c6a512-1295-4272-9138-f99709370657
2007-04-03 18:06:13 +00:00
Jens Arnold
6f3c600bde
Fix flickering battery icon in the player sim.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13003 a1c6a512-1295-4272-9138-f99709370657
2007-04-02 19:31:11 +00:00
Jens Arnold
54ea2e435e
Charcell lcd driver: Preparations for switching to non-immediate LCD updates, using lcd_update() like on bitmap targets. * Added proper clipping. * Simplified simulator code.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12979 a1c6a512-1295-4272-9138-f99709370657
2007-03-31 09:58:49 +00:00
Steve Bavin
11fa3a871c
Implement remove_thread for SDL simulator
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12971 a1c6a512-1295-4272-9138-f99709370657
2007-03-30 16:02:42 +00:00
Jens Arnold
ad4e3d6657
First step of charcell LCD code rework: * Make it fully unicode aware so that adding non-ISO8859-1 scripts becomes possible (limited by the LCD capabilities of course). * Make the API more similar to the bitmap LCD code's API. * Moved hardware dependent parts to target tree. * Simplified code. * Jumpscroll temporarily non-functional.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12916 a1c6a512-1295-4272-9138-f99709370657
2007-03-26 07:52:13 +00:00
Jens Arnold
bd5c0ad7bb
Cast some more to keep both 32 bit and 64 bit simulator platforms happy.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12819 a1c6a512-1295-4272-9138-f99709370657
2007-03-17 10:50:58 +00:00
Michael Sevakis
a2ee6a6681
FM Radio mishmash: Make a quieter screen for the SWCODEC targets esp. for the benefit of x5; I wasn't sure if it was good to alter timeouts for HW codec. Simplify things and prepare for eventual scanning and tuning changes (which should help quiet x5 down even more). Make things behave themselves better in general. Enable SWCODEC FM Recording menu and screen for sim as a bonus.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12804 a1c6a512-1295-4272-9138-f99709370657
2007-03-16 14:40:40 +00:00
Michael Sevakis
c2d2106fd7
Audio Init: Just can't stand that heirarchy. Add one level of abstraction. Might come in handy anyhow. Use sound.h instead of the conditional includes for audio hardware headers. If someone doesn't like that, yell at my evil twin. :)
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12718 a1c6a512-1295-4272-9138-f99709370657
2007-03-11 06:21:43 +00:00
Michael Sevakis
6a384d2e67
Add audiohw_postinit() stub for the sims.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12716 a1c6a512-1295-4272-9138-f99709370657
2007-03-11 05:27:13 +00:00
Daniel Ankers
82f9056988
Dual core support for PP502x players (iPod G4 and later, iriver h10, Sansa - iPod G3 will be coming soon.) This allows threads to be run on either core provided that all communications between the cores is done using uncached memory. There should be no significant change in battery life from doing this. Documentation (on the RockboxKernel wiki page) will follow shortly.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12601 a1c6a512-1295-4272-9138-f99709370657
2007-03-04 20:06:41 +00:00
Jens Arnold
c652218d14
Fix remaining CONFIG_TUNER checks.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12385 a1c6a512-1295-4272-9138-f99709370657
2007-02-18 08:46:12 +00:00
Jonathan Gordon
5599d6806d
Icons in the menus. Thanks midkay for them.
...
Any menus which dont yet show them are not converted to the new system.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12300 a1c6a512-1295-4272-9138-f99709370657
2007-02-14 06:58:30 +00:00
Jens Arnold
6b0fdae0f6
Removed unused 'mode' parameter from mkdir() for consistency with creat().
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12183 a1c6a512-1295-4272-9138-f99709370657
2007-02-03 10:28:55 +00:00
Jens Arnold
67eb154146
Removed 'mode' parameter from creat(). It wasn't pure posix anyway, it was ignored on target and mixed into 'oflags' in the simulator. * Simplified io.c a bit by defining a dummy O_BINARY for OSes which don't have that.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12179 a1c6a512-1295-4272-9138-f99709370657
2007-02-01 23:08:15 +00:00
Miika Pekkarinen
0dd7ea2d71
Support building tagcache db natively on PC using the core of the
...
Rockbox tagcache database engine. Only host endian support at the
moment and no command line parameters. Mainly for developers for
debugging at the moment.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11497 a1c6a512-1295-4272-9138-f99709370657
2006-11-10 08:03:33 +00:00
Jens Arnold
a796260a6b
Next step of Makefile tuning: * Use 'make' internal commands for printing messages. Saves build time especially on cygwin. * SILENT variable used in more places. * Bitmap build system uses one Makefille less.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11369 a1c6a512-1295-4272-9138-f99709370657
2006-10-27 21:48:06 +00:00
Jens Arnold
d1ce4e779e
Consistent style of 'make' messages. Always use ranlib after ar.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11322 a1c6a512-1295-4272-9138-f99709370657
2006-10-23 22:33:39 +00:00
Barry Wardell
64f949f295
Allow UI simulator to be build on OS (Slightly updated version of FS5767)
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11094 a1c6a512-1295-4272-9138-f99709370657
2006-09-29 16:15:11 +00:00
Steve Bavin
8c9d5f35f0
Improve simulator use of multiple codecs
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11083 a1c6a512-1295-4272-9138-f99709370657
2006-09-28 08:46:28 +00:00
Steve Bavin
076ab8d206
Fixed settings persistence for simulators
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11082 a1c6a512-1295-4272-9138-f99709370657
2006-09-28 08:45:40 +00:00
Daniel Ankers
8300d8c194
Oops - fix warnings and add a simulator version of remove_thread_on_core()
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10876 a1c6a512-1295-4272-9138-f99709370657
2006-09-03 21:00:19 +00:00
Miika Pekkarinen
d70bd0e03d
FS#5884 Fix simulator file delete/rename with dircache.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10757 a1c6a512-1295-4272-9138-f99709370657
2006-08-26 14:19:18 +00:00
Linus Nielsen Feltzing
c849219370
Moved the X5 button driver to the target tree
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10339 a1c6a512-1295-4272-9138-f99709370657
2006-07-27 13:27:31 +00:00
Jens Arnold
9051afa8a0
Contrast setting cleanup: * Only include contrast setting for targets where it's used. * Make lcd_default_contrast() a stub for simulators.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10317 a1c6a512-1295-4272-9138-f99709370657
2006-07-25 11:15:50 +00:00
Hardeep Sidhu
25377dbd7d
Simulator: two codecs may be loaded at same time if voice is enabled.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10130 a1c6a512-1295-4272-9138-f99709370657
2006-06-17 09:42:16 +00:00
Dan Everton
5f40aac300
Don't pass NULL to dlclose. Stops the simulator crashing if there's a problem loading a plugin or codec.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9003 a1c6a512-1295-4272-9138-f99709370657
2006-03-11 16:16:15 +00:00
Jens Arnold
38b7547ef4
Simulators: Fix pointer size vs. int size problems (64bit hosts) in plugin loader and codec loader.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8880 a1c6a512-1295-4272-9138-f99709370657
2006-03-02 01:08:38 +00:00
Linus Nielsen Feltzing
37b15d3833
Protect against text-mode files in Windows by using open() instead of creat()
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8781 a1c6a512-1295-4272-9138-f99709370657
2006-02-22 14:41:45 +00:00
Jens Arnold
3e496e3ecf
Reworked player simulator icons to fit the changed charcell scale factor and look more like the actual icons. Adapted player sim display sizes.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8745 a1c6a512-1295-4272-9138-f99709370657
2006-02-20 00:31:10 +00:00
Dan Everton
1064f019b8
Fix permissions of directories created in the sim.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8726 a1c6a512-1295-4272-9138-f99709370657
2006-02-18 13:26:09 +00:00
Dan Everton
3ba0060ac1
Backlight support for 8-bit targets in SDL sim. Redo sound handling. Still doesn't work right, but is closer to how the actual Rockbox system does it. Move some stub functions in to Win32 and X11 sims to keep them compiling.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8686 a1c6a512-1295-4272-9138-f99709370657
2006-02-13 21:46:28 +00:00
Dan Everton
b585e87b45
Refactor SDL sim source so drawing routines are written once. Split bitmap, remote, and charcell LCD in to their own files. Add zoom support, use --zoom factor (e.g. --zoom 2 for two times zoom) to use it.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8645 a1c6a512-1295-4272-9138-f99709370657
2006-02-09 21:49:28 +00:00
Linus Nielsen Feltzing
e7c7d9b051
Bah, O_BINARY is of course Win32 only
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8564 a1c6a512-1295-4272-9138-f99709370657
2006-02-04 20:35:46 +00:00
Linus Nielsen Feltzing
8599b07113
Fixed the codec loading problem in the Win32 SDL simulator
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8563 a1c6a512-1295-4272-9138-f99709370657
2006-02-04 20:13:06 +00:00
Linus Nielsen Feltzing
fc72c53758
Patch #1417462 by Dan Everton - Improved SDL simulator
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8546 a1c6a512-1295-4272-9138-f99709370657
2006-02-03 15:19:58 +00:00
Linus Nielsen Feltzing
60e8f4f988
First steps towards SDL sim for windows
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8449 a1c6a512-1295-4272-9138-f99709370657
2006-01-25 12:15:25 +00:00
Miika Pekkarinen
4503b96749
Fixed the red builds.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8417 a1c6a512-1295-4272-9138-f99709370657
2006-01-22 11:56:08 +00:00
Jens Arnold
b8749fdf21
New codec loader, using the same mechanism as the new plugin loader. API version numbering restarted for the new system. Uses the target ID from configure, so don't change that too often. * Fixed sim_plugin_load_ram() to truncate the tempfile. * Reduced plugin buffer size to 512KB for iriver and iPod.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8362 a1c6a512-1295-4272-9138-f99709370657
2006-01-18 00:05:14 +00:00
Jens Arnold
a79027743a
Model & version check for simulator plugins.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8356 a1c6a512-1295-4272-9138-f99709370657
2006-01-16 23:20:58 +00:00
Dave Chapman
060320b95c
Fix red sim builds - add rtc_read_datetime and rtc_write_datetime functions for the simulator
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8218 a1c6a512-1295-4272-9138-f99709370657
2005-12-11 02:00:28 +00:00
Daniel Stenberg
ee76cc3716
silence picky gcc4 warnings
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8097 a1c6a512-1295-4272-9138-f99709370657
2005-11-28 09:36:26 +00:00
Kevin Ferrare
74b6af93b1
Added multi-screen support for quickscreen (mostly rewritten from scratch) and USB screen ; just looking at the hour makes me think it could be buggy
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8039 a1c6a512-1295-4272-9138-f99709370657
2005-11-22 03:38:07 +00:00
Jens Arnold
b51f7dfc9b
Backlight handling: * Added 'Caption Backlight' and 'Backlight On When Charging' for the iriver remote LCD. * Enabled the backlight code for the simulator, and prepared backlight simulation. It's only a stub atm, writing messages to the console window. * Added tick task handling to the simulators for this to work. * Code cleanup in backlight.c, less dead code.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8034 a1c6a512-1295-4272-9138-f99709370657
2005-11-21 23:55:39 +00:00
Jens Arnold
3be6cf1574
16bit colour support (H300) for the win32 simulator.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7898 a1c6a512-1295-4272-9138-f99709370657
2005-11-15 23:37:21 +00:00
Jens Arnold
d6c054575b
Renamed CONFIG_HWCODEC and MASNONE to the more appropriate CONFIG_CODEC and SWCODEC, respectively.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7416 a1c6a512-1295-4272-9138-f99709370657
2005-08-29 21:15:27 +00:00
Miika Pekkarinen
159c52dd36
Initial voice ui support for software codec platforms. Added also a
...
beep when changing tracks.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7360 a1c6a512-1295-4272-9138-f99709370657
2005-08-20 11:13:19 +00:00
Linus Nielsen Feltzing
d3fde76fc7
FM radio simulation working again
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7332 a1c6a512-1295-4272-9138-f99709370657
2005-08-16 06:50:25 +00:00
Miika Pekkarinen
e9c0e83154
Fixed the simulator.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7219 a1c6a512-1295-4272-9138-f99709370657
2005-07-22 06:44:47 +00:00
Miika Pekkarinen
eab434c416
More accurate playback position calculation.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7218 a1c6a512-1295-4272-9138-f99709370657
2005-07-22 06:32:55 +00:00
Miika Pekkarinen
3b6a9f3bad
Fixed the simulator.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7212 a1c6a512-1295-4272-9138-f99709370657
2005-07-21 12:25:30 +00:00
Miika Pekkarinen
f090dc3829
Crossfade (and pcm buffer size) length is now configurable.
...
Implemented anti-skip buffer setting for iriver also. Settings block
bumped up, PLEASE SAVE YOUR SETTINGS BEFORE UPGRADING.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7210 a1c6a512-1295-4272-9138-f99709370657
2005-07-21 11:44:00 +00:00
Magnus Holmgren
30b8378b68
Win32 needs the mode bits for open too.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7200 a1c6a512-1295-4272-9138-f99709370657
2005-07-19 18:18:37 +00:00
Miika Pekkarinen
05012ac9f7
Enable crossfade for simulator.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7151 a1c6a512-1295-4272-9138-f99709370657
2005-07-15 07:15:39 +00:00
Daniel Stenberg
febb52fc03
First take at PCM playback in the X11 sim on Linux.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7147 a1c6a512-1295-4272-9138-f99709370657
2005-07-14 21:46:07 +00:00
Daniel Stenberg
9872813c7d
introducing H1x0 style grayscale support in the X11 sim
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7137 a1c6a512-1295-4272-9138-f99709370657
2005-07-14 10:02:04 +00:00
Miika Pekkarinen
20b3897474
Separated buffering stuff from pcm_playback to pcmbuf. Renamed some
...
function calls (audiobuffer -> pcmbuf etc.).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7131 a1c6a512-1295-4272-9138-f99709370657
2005-07-13 12:48:22 +00:00
Miika Pekkarinen
645a2e16ed
Fixed a simulator crash while trying to play a song. Fixed crossfade
...
when selecting a new track to play. Most likely fixed a bug which
caused playback to stop on track change.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7094 a1c6a512-1295-4272-9138-f99709370657
2005-07-10 16:33:03 +00:00
Jens Arnold
22c15b78c8
Simulator stub for remote lcd flip.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6740 a1c6a512-1295-4272-9138-f99709370657
2005-06-17 22:03:56 +00:00